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

Side by Side Diff: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm

Issue 1336823003: Move chrome::HostDesktopType to ui::HostDesktopType (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@base_session_service_delegate_impl
Patch Set: Fix build on Mac and CrOS Created 5 years, 3 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/apps/app_shim_menu_controller_mac.h" 5 #import "chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #import "base/mac/foundation_util.h" 10 #import "base/mac/foundation_util.h"
(...skipping 197 matching lines...) Expand 10 before | Expand all | Expand 10 after
208 // items under the "Edit" menu. 208 // items under the "Edit" menu.
209 // Disabled until tab versus window apps are properly tested 209 // Disabled until tab versus window apps are properly tested
210 // http://crbug.com/517744 210 // http://crbug.com/517744
211 IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest, 211 IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
212 DISABLED_HostedAppHasAdditionalEditMenuItems) { 212 DISABLED_HostedAppHasAdditionalEditMenuItems) {
213 SetUpApps(HOSTED | PACKAGED_1); 213 SetUpApps(HOSTED | PACKAGED_1);
214 214
215 // Find the first hosted app window. 215 // Find the first hosted app window.
216 Browser* hosted_app_browser = nullptr; 216 Browser* hosted_app_browser = nullptr;
217 BrowserList* browsers = 217 BrowserList* browsers =
218 BrowserList::GetInstance(chrome::HOST_DESKTOP_TYPE_NATIVE); 218 BrowserList::GetInstance(ui::HOST_DESKTOP_TYPE_NATIVE);
219 for (Browser* browser : *browsers) { 219 for (Browser* browser : *browsers) {
220 const extensions::Extension* extension = 220 const extensions::Extension* extension =
221 apps::ExtensionAppShimHandler::MaybeGetAppForBrowser(browser); 221 apps::ExtensionAppShimHandler::MaybeGetAppForBrowser(browser);
222 if (extension && extension->is_hosted_app()) { 222 if (extension && extension->is_hosted_app()) {
223 hosted_app_browser = browser; 223 hosted_app_browser = browser;
224 break; 224 break;
225 } 225 }
226 } 226 }
227 EXPECT_TRUE(hosted_app_browser); 227 EXPECT_TRUE(hosted_app_browser);
228 228
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
260 260
261 // OSX will send NSWindowWillResignMainNotification when a main window is 261 // OSX will send NSWindowWillResignMainNotification when a main window is
262 // closed. 262 // closed.
263 [[NSNotificationCenter defaultCenter] 263 [[NSNotificationCenter defaultCenter]
264 postNotificationName:NSWindowDidResignMainNotification 264 postNotificationName:NSWindowDidResignMainNotification
265 object:app_1_window]; 265 object:app_1_window];
266 CheckNoAppMenus(); 266 CheckNoAppMenus();
267 } 267 }
268 268
269 } // namespace 269 } // namespace
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698