diff options
| author | yoz <yoz@chromium.org> | 2014-11-19 14:00:48 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-11-19 22:01:44 +0000 |
| commit | 0e463fafeca7afbda7e4060a7ce591f7eab82c2f (patch) | |
| tree | 96f46ca64ac05eb5bd1d1c7af8862966afbfb25e /extensions/shell/test | |
| parent | d48d16fd939c8fa9ef6473ff99f92c643c901542 (diff) | |
| download | chromium_src-0e463fafeca7afbda7e4060a7ce591f7eab82c2f.zip chromium_src-0e463fafeca7afbda7e4060a7ce591f7eab82c2f.tar.gz chromium_src-0e463fafeca7afbda7e4060a7ce591f7eab82c2f.tar.bz2 | |
Refactor ShellDesktopController and ShellNativeAppWindow to allow for non-Aura implementations.
Rename ShellDesktopController to ShellDesktopControllerAura; make ShellNativeAppWindow implement only some of the BaseWindow methods, and move aura-specific bits to ShellNativeAppWindowAura. Adds a unit test for ShellNativeAppWindowAura.
This is a precursor to a Cocoa implementation for Mac.
BUG=399363
TBR=danakj@chromium.org,reed@google.com
Review URL: https://codereview.chromium.org/696063008
Cr-Commit-Position: refs/heads/master@{#304897}
Diffstat (limited to 'extensions/shell/test')
| -rw-r--r-- | extensions/shell/test/shell_test.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/extensions/shell/test/shell_test.cc b/extensions/shell/test/shell_test.cc index 87e5430..37147766a 100644 --- a/extensions/shell/test/shell_test.cc +++ b/extensions/shell/test/shell_test.cc @@ -8,8 +8,8 @@ #include "base/logging.h" #include "content/public/common/content_switches.h" #include "extensions/browser/extension_system.h" +#include "extensions/shell/browser/desktop_controller.h" #include "extensions/shell/browser/shell_content_browser_client.h" -#include "extensions/shell/browser/shell_desktop_controller.h" #include "extensions/shell/browser/shell_extension_system.h" namespace extensions { @@ -44,7 +44,7 @@ void AppShellTest::RunTestOnMainThreadLoop() { TearDownOnMainThread(); // Clean up the app window. - ShellDesktopController::instance()->CloseAppWindows(); + DesktopController::instance()->CloseAppWindows(); } } // namespace extensions |