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

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

Issue 17593006: mac: Update clients of scoped_nsobject.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: iwyu, scoped_nsprotocol Created 7 years, 6 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/files/file_path.h" 7 #include "base/files/file_path.h"
8 #include "base/json/json_file_value_serializer.h" 8 #include "base/json/json_file_value_serializer.h"
9 #include "base/path_service.h" 9 #include "base/path_service.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 [toolbarController locationBarBridge]; 57 [toolbarController locationBarBridge];
58 locationBarView->Update(contents, false); 58 locationBarView->Update(contents, false);
59 } 59 }
60 60
61 const Extension* extension_; 61 const Extension* extension_;
62 ExtensionAction* action_; 62 ExtensionAction* action_;
63 }; 63 };
64 64
65 IN_PROC_BROWSER_TEST_F(ExtensionActionContextMenuTest, BasicTest) { 65 IN_PROC_BROWSER_TEST_F(ExtensionActionContextMenuTest, BasicTest) {
66 SetupPageAction(); 66 SetupPageAction();
67 scoped_nsobject<ExtensionActionContextMenu> menu; 67 base::scoped_nsobject<ExtensionActionContextMenu> menu;
68 menu.reset([[ExtensionActionContextMenu alloc] initWithExtension:extension_ 68 menu.reset([[ExtensionActionContextMenu alloc] initWithExtension:extension_
69 browser:browser() 69 browser:browser()
70 extensionAction:action_]); 70 extensionAction:action_]);
71 71
72 NSMenuItem* inspectItem = [menu itemWithTag: 72 NSMenuItem* inspectItem = [menu itemWithTag:
73 extension_action_context_menu::kExtensionContextInspect]; 73 extension_action_context_menu::kExtensionContextInspect];
74 EXPECT_TRUE(inspectItem); 74 EXPECT_TRUE(inspectItem);
75 75
76 PrefService* service = browser()->profile()->GetPrefs(); 76 PrefService* service = browser()->profile()->GetPrefs();
77 bool original = service->GetBoolean(prefs::kExtensionsUIDeveloperMode); 77 bool original = service->GetBoolean(prefs::kExtensionsUIDeveloperMode);
(...skipping 18 matching lines...) Expand all
96 EXPECT_TRUE(extension_); 96 EXPECT_TRUE(extension_);
97 extensions::ExtensionActionManager* action_manager = 97 extensions::ExtensionActionManager* action_manager =
98 extensions::ExtensionActionManager::Get(browser()->profile()); 98 extensions::ExtensionActionManager::Get(browser()->profile());
99 action_ = action_manager->GetBrowserAction(*extension_); 99 action_ = action_manager->GetBrowserAction(*extension_);
100 EXPECT_TRUE(action_); 100 EXPECT_TRUE(action_);
101 101
102 Browser* empty_browser( 102 Browser* empty_browser(
103 new Browser(Browser::CreateParams(browser()->profile(), 103 new Browser(Browser::CreateParams(browser()->profile(),
104 browser()->host_desktop_type()))); 104 browser()->host_desktop_type())));
105 105
106 scoped_nsobject<ExtensionActionContextMenu> menu; 106 base::scoped_nsobject<ExtensionActionContextMenu> menu;
107 menu.reset([[ExtensionActionContextMenu alloc] 107 menu.reset([[ExtensionActionContextMenu alloc]
108 initWithExtension:extension_ 108 initWithExtension:extension_
109 browser:empty_browser 109 browser:empty_browser
110 extensionAction:action_]); 110 extensionAction:action_]);
111 111
112 NSMenuItem* inspectItem = [menu itemWithTag: 112 NSMenuItem* inspectItem = [menu itemWithTag:
113 extension_action_context_menu::kExtensionContextInspect]; 113 extension_action_context_menu::kExtensionContextInspect];
114 EXPECT_TRUE(inspectItem); 114 EXPECT_TRUE(inspectItem);
115 115
116 // Close the empty browser. Can't just free it directly because there are 116 // Close the empty browser. Can't just free it directly because there are
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
151 base::Callback<void(content::DevToolsAgentHost*, bool)> devtools_callback_; 151 base::Callback<void(content::DevToolsAgentHost*, bool)> devtools_callback_;
152 152
153 DISALLOW_COPY_AND_ASSIGN(DevToolsAttachedObserver); 153 DISALLOW_COPY_AND_ASSIGN(DevToolsAttachedObserver);
154 }; 154 };
155 155
156 } // namespace 156 } // namespace
157 157
158 IN_PROC_BROWSER_TEST_F( 158 IN_PROC_BROWSER_TEST_F(
159 ExtensionActionContextMenuTest, DISABLED_RunInspectPopup) { 159 ExtensionActionContextMenuTest, DISABLED_RunInspectPopup) {
160 SetupPageAction(); 160 SetupPageAction();
161 scoped_nsobject<ExtensionActionContextMenu> menu; 161 base::scoped_nsobject<ExtensionActionContextMenu> menu;
162 menu.reset([[ExtensionActionContextMenu alloc] initWithExtension:extension_ 162 menu.reset([[ExtensionActionContextMenu alloc] initWithExtension:extension_
163 browser:browser() 163 browser:browser()
164 extensionAction:action_]); 164 extensionAction:action_]);
165 165
166 NSMenuItem* inspectItem = [menu itemWithTag: 166 NSMenuItem* inspectItem = [menu itemWithTag:
167 extension_action_context_menu::kExtensionContextInspect]; 167 extension_action_context_menu::kExtensionContextInspect];
168 EXPECT_TRUE(inspectItem); 168 EXPECT_TRUE(inspectItem);
169 169
170 PrefService* service = browser()->profile()->GetPrefs(); 170 PrefService* service = browser()->profile()->GetPrefs();
171 bool original = service->GetBoolean(prefs::kExtensionsUIDeveloperMode); 171 bool original = service->GetBoolean(prefs::kExtensionsUIDeveloperMode);
172 172
173 service->SetBoolean(prefs::kExtensionsUIDeveloperMode, true); 173 service->SetBoolean(prefs::kExtensionsUIDeveloperMode, true);
174 EXPECT_FALSE([inspectItem isHidden]); 174 EXPECT_FALSE([inspectItem isHidden]);
175 175
176 scoped_refptr<content::MessageLoopRunner> loop_runner( 176 scoped_refptr<content::MessageLoopRunner> loop_runner(
177 new content::MessageLoopRunner); 177 new content::MessageLoopRunner);
178 DevToolsAttachedObserver observer(loop_runner->QuitClosure()); 178 DevToolsAttachedObserver observer(loop_runner->QuitClosure());
179 [NSApp sendAction:[inspectItem action] 179 [NSApp sendAction:[inspectItem action]
180 to:[inspectItem target] 180 to:[inspectItem target]
181 from:inspectItem]; 181 from:inspectItem];
182 loop_runner->Run(); 182 loop_runner->Run();
183 183
184 service->SetBoolean(prefs::kExtensionsUIDeveloperMode, original); 184 service->SetBoolean(prefs::kExtensionsUIDeveloperMode, original);
185 } 185 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698