Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(461)

Side by Side Diff: chrome/browser/ui/cocoa/extensions/extension_action_context_menu_browsertest.mm

Issue 12066003: Remove TabStripModel wrapper use. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: gtk Created 7 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h" 5 #import "chrome/browser/ui/cocoa/extensions/extension_action_context_menu.h"
6 6
7 #include "base/file_path.h" 7 #include "base/file_path.h"
8 #include "base/file_util.h" 8 #include "base/file_util.h"
9 #include "base/json/json_file_value_serializer.h" 9 #include "base/json/json_file_value_serializer.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "chrome/browser/extensions/browser_action_test_util.h" 11 #include "chrome/browser/extensions/browser_action_test_util.h"
12 #include "chrome/browser/extensions/extension_action.h" 12 #include "chrome/browser/extensions/extension_action.h"
13 #include "chrome/browser/extensions/extension_action_manager.h" 13 #include "chrome/browser/extensions/extension_action_manager.h"
14 #include "chrome/browser/extensions/extension_browsertest.h" 14 #include "chrome/browser/extensions/extension_browsertest.h"
15 #include "chrome/browser/extensions/extension_tab_util.h" 15 #include "chrome/browser/extensions/extension_tab_util.h"
16 #include "chrome/browser/prefs/pref_service.h" 16 #include "chrome/browser/prefs/pref_service.h"
17 #include "chrome/browser/profiles/profile.h" 17 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/browser.h" 18 #include "chrome/browser/ui/browser.h"
19 #include "chrome/browser/ui/browser_tabstrip.h"
20 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h" 19 #include "chrome/browser/ui/cocoa/browser_window_cocoa.h"
21 #include "chrome/browser/ui/cocoa/browser_window_controller.h" 20 #include "chrome/browser/ui/cocoa/browser_window_controller.h"
22 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" 21 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
23 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h" 22 #include "chrome/browser/ui/cocoa/toolbar/toolbar_controller.h"
23 #include "chrome/browser/ui/tabs/tab_strip_model.h"
24 #include "chrome/common/chrome_paths.h" 24 #include "chrome/common/chrome_paths.h"
25 #include "chrome/common/extensions/extension.h" 25 #include "chrome/common/extensions/extension.h"
26 #include "chrome/common/pref_names.h" 26 #include "chrome/common/pref_names.h"
27 #include "content/public/browser/notification_service.h" 27 #include "content/public/browser/notification_service.h"
28 #include "content/public/test/test_utils.h" 28 #include "content/public/test/test_utils.h"
29 29
30 using extensions::Extension; 30 using extensions::Extension;
31 31
32 class ExtensionActionContextMenuTest : public ExtensionBrowserTest { 32 class ExtensionActionContextMenuTest : public ExtensionBrowserTest {
33 public: 33 public:
34 ExtensionActionContextMenuTest() : extension_(NULL), action_(NULL) {} 34 ExtensionActionContextMenuTest() : extension_(NULL), action_(NULL) {}
35 35
36 protected: 36 protected:
37 void SetupPageAction() { 37 void SetupPageAction() {
38 extension_ = InstallExtension( 38 extension_ = InstallExtension(
39 test_data_dir_.AppendASCII("browsertest") 39 test_data_dir_.AppendASCII("browsertest")
40 .AppendASCII("page_action_popup"), 40 .AppendASCII("page_action_popup"),
41 1); 41 1);
42 EXPECT_TRUE(extension_); 42 EXPECT_TRUE(extension_);
43 extensions::ExtensionActionManager* action_manager = 43 extensions::ExtensionActionManager* action_manager =
44 extensions::ExtensionActionManager::Get(browser()->profile()); 44 extensions::ExtensionActionManager::Get(browser()->profile());
45 action_ = action_manager->GetPageAction(*extension_); 45 action_ = action_manager->GetPageAction(*extension_);
46 EXPECT_TRUE(action_); 46 EXPECT_TRUE(action_);
47 47
48 content::WebContents* contents = chrome::GetActiveWebContents(browser()); 48 content::WebContents* contents =
49 browser()->tab_strip_model()->GetActiveWebContents();
49 action_->SetAppearance(ExtensionTabUtil::GetTabId(contents), 50 action_->SetAppearance(ExtensionTabUtil::GetTabId(contents),
50 ExtensionAction::ACTIVE); 51 ExtensionAction::ACTIVE);
51 52
52 BrowserWindowCocoa* window = 53 BrowserWindowCocoa* window =
53 static_cast<BrowserWindowCocoa*>(browser()->window()); 54 static_cast<BrowserWindowCocoa*>(browser()->window());
54 ToolbarController* toolbarController = 55 ToolbarController* toolbarController =
55 [window->cocoa_controller() toolbarController]; 56 [window->cocoa_controller() toolbarController];
56 LocationBarViewMac* locationBarView = 57 LocationBarViewMac* locationBarView =
57 [toolbarController locationBarBridge]; 58 [toolbarController locationBarBridge];
58 locationBarView->Update(contents, false); 59 locationBarView->Update(contents, false);
(...skipping 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 to:[inspectItem target] 147 to:[inspectItem target]
147 from:inspectItem]; 148 from:inspectItem];
148 devtools_attached_observer.Wait(); 149 devtools_attached_observer.Wait();
149 150
150 // Hide the popup to prevent racy crashes at test cleanup. 151 // Hide the popup to prevent racy crashes at test cleanup.
151 BrowserActionTestUtil test_util(browser()); 152 BrowserActionTestUtil test_util(browser());
152 test_util.HidePopup(); 153 test_util.HidePopup();
153 154
154 service->SetBoolean(prefs::kExtensionsUIDeveloperMode, original); 155 service->SetBoolean(prefs::kExtensionsUIDeveloperMode, original);
155 } 156 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698