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

Unified Diff: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm

Issue 494033002: Move AppWindow to extensions (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove unneeded include in chrome_shell_delegate.cc Created 6 years, 4 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
diff --git a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
index 1679709210f8b042a3e3b79905a37b7b6ad06e4c..2e660de34bf3627c95beeebe45c79f31ade1c908 100644
--- a/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
+++ b/chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac_browsertest.mm
@@ -6,7 +6,6 @@
#import <Cocoa/Cocoa.h>
-#include "apps/app_window_registry.h"
#include "base/command_line.h"
#include "base/mac/scoped_nsobject.h"
#include "base/strings/sys_string_conversions.h"
@@ -17,6 +16,7 @@
#include "chrome/browser/ui/browser_iterator.h"
#include "chrome/browser/ui/browser_window.h"
#include "chrome/common/chrome_switches.h"
+#include "extensions/browser/app_window/app_window_registry.h"
#include "extensions/browser/app_window/native_app_window.h"
#include "extensions/browser/uninstall_reason.h"
#include "extensions/common/extension.h"
@@ -90,18 +90,18 @@ IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
SetUpApps();
// When an app is focused, all Chrome menu items should be hidden, and a menu
// item for the app should be added.
- apps::AppWindow* app_1_app_window = apps::AppWindowRegistry::Get(profile())
- ->GetAppWindowsForApp(app_1_->id())
- .front();
+ extensions::AppWindow* app_1_app_window =
+ extensions::AppWindowRegistry::Get(profile())
+ ->GetAppWindowsForApp(app_1_->id()).front();
[[NSNotificationCenter defaultCenter]
postNotificationName:NSWindowDidBecomeMainNotification
object:app_1_app_window->GetNativeWindow()];
CheckHasAppMenus(app_1_);
// When another app is focused, the menu item for the app should change.
- apps::AppWindow* app_2_app_window = apps::AppWindowRegistry::Get(profile())
- ->GetAppWindowsForApp(app_2_->id())
- .front();
+ extensions::AppWindow* app_2_app_window =
+ extensions::AppWindowRegistry::Get(profile())
+ ->GetAppWindowsForApp(app_2_->id()).front();
[[NSNotificationCenter defaultCenter]
postNotificationName:NSWindowDidBecomeMainNotification
object:app_2_app_window->GetNativeWindow()];
@@ -133,16 +133,16 @@ IN_PROC_BROWSER_TEST_F(AppShimMenuControllerBrowserTest,
// an app is uninstalled. We need to close the other windows first since the
// menu only changes on a NSWindowWillCloseNotification if there are no other
// windows.
- apps::AppWindow* app_2_app_window = apps::AppWindowRegistry::Get(profile())
- ->GetAppWindowsForApp(app_2_->id())
- .front();
+ extensions::AppWindow* app_2_app_window =
+ extensions::AppWindowRegistry::Get(profile())
+ ->GetAppWindowsForApp(app_2_->id()).front();
app_2_app_window->GetBaseWindow()->Close();
chrome::BrowserIterator()->window()->Close();
- apps::AppWindow* app_1_app_window = apps::AppWindowRegistry::Get(profile())
- ->GetAppWindowsForApp(app_1_->id())
- .front();
+ extensions::AppWindow* app_1_app_window =
+ extensions::AppWindowRegistry::Get(profile())
+ ->GetAppWindowsForApp(app_1_->id()).front();
[[NSNotificationCenter defaultCenter]
postNotificationName:NSWindowDidBecomeMainNotification
object:app_1_app_window->GetNativeWindow()];
« no previous file with comments | « chrome/browser/ui/cocoa/apps/app_shim_menu_controller_mac.mm ('k') | chrome/browser/ui/cocoa/apps/chrome_apps_client_cocoa.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698