diff options
| author | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 05:36:33 +0000 |
|---|---|---|
| committer | jamescook@chromium.org <jamescook@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-02-15 05:36:33 +0000 |
| commit | dbb03fbe591bdf4e711af10c3e8233e68b29ee49 (patch) | |
| tree | 0958d99e8988d6bfd7aefe6bf024b425fbef46af /chrome/browser/app_controller_mac_browsertest.mm | |
| parent | 26f8f3aa15d34fd29080889512131b02d933fef5 (diff) | |
| download | chromium_src-dbb03fbe591bdf4e711af10c3e8233e68b29ee49.zip chromium_src-dbb03fbe591bdf4e711af10c3e8233e68b29ee49.tar.gz chromium_src-dbb03fbe591bdf4e711af10c3e8233e68b29ee49.tar.bz2 | |
Rename apps::ShellWindow to apps::AppWindow
* Rename ShellWindowRegistry
* Rename ShellWindowGeometryCache
* Rename members like shell_window_ to app_window_
* Rename locals like shell_window to app_window
BUG=343591
TEST=compiles
COLLABORATOR=scheib@chromium.org
TBR=skuhne@chromium.org for chrome/browser/ui/ash/launcher
TBR=thakis@chromium.org for chrome/browser/ui/cocoa
TBR=erg@chromium.org for chrome/browser/ui/gtk
TBR=sky@chromium.org for chrome/test
Review URL: https://codereview.chromium.org/166573005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@251542 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/app_controller_mac_browsertest.mm')
| -rw-r--r-- | chrome/browser/app_controller_mac_browsertest.mm | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/chrome/browser/app_controller_mac_browsertest.mm b/chrome/browser/app_controller_mac_browsertest.mm index 70498ec..d094111 100644 --- a/chrome/browser/app_controller_mac_browsertest.mm +++ b/chrome/browser/app_controller_mac_browsertest.mm @@ -4,18 +4,18 @@ #import <Cocoa/Cocoa.h> -#include "apps/shell_window_registry.h" +#include "apps/app_window_registry.h" #include "base/command_line.h" #include "base/mac/scoped_nsobject.h" #include "base/prefs/pref_service.h" #include "chrome/app/chrome_command_ids.h" #import "chrome/browser/app_controller_mac.h" #include "chrome/browser/apps/app_browsertest_util.h" +#include "chrome/browser/browser_process.h" #include "chrome/browser/extensions/extension_test_message_listener.h" #include "chrome/browser/profiles/profile_manager.h" #include "chrome/browser/ui/browser.h" #include "chrome/browser/ui/browser_list.h" -#include "chrome/browser/browser_process.h" #include "chrome/browser/ui/browser_window.h" #import "chrome/browser/ui/cocoa/user_manager_mac.h" #include "chrome/browser/ui/host_desktop.h" @@ -73,8 +73,10 @@ IN_PROC_BROWSER_TEST_F(AppControllerPlatformAppBrowserTest, InstallAndLaunchPlatformApp("minimal"); ASSERT_TRUE(listener.WaitUntilSatisfied()); - NSWindow* app_window = apps::ShellWindowRegistry::Get(profile())-> - GetShellWindowsForApp(app->id()).front()->GetNativeWindow(); + NSWindow* app_window = apps::AppWindowRegistry::Get(profile()) + ->GetAppWindowsForApp(app->id()) + .front() + ->GetNativeWindow(); NSWindow* browser_window = browser()->window()->GetNativeWindow(); EXPECT_LE([[NSApp orderedWindows] indexOfObject:app_window], |