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 /athena | |
| 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 'athena')
| -rw-r--r-- | athena/main/DEPS | 1 | ||||
| -rw-r--r-- | athena/main/athena_main_delegate.cc | 7 |
2 files changed, 6 insertions, 2 deletions
diff --git a/athena/main/DEPS b/athena/main/DEPS index bc49ee0..641178b 100644 --- a/athena/main/DEPS +++ b/athena/main/DEPS @@ -22,6 +22,7 @@ include_rules = [ "+ui/base", "+ui/compositor", "+ui/events", + "+ui/gfx", "+ui/gl", "+ui/keyboard", "+ui/native_theme", diff --git a/athena/main/athena_main_delegate.cc b/athena/main/athena_main_delegate.cc index 9283628..979d2c2 100644 --- a/athena/main/athena_main_delegate.cc +++ b/athena/main/athena_main_delegate.cc @@ -24,7 +24,10 @@ #include "extensions/shell/common/switches.h" #include "extensions/shell/renderer/shell_content_renderer_client.h" #include "ppapi/c/private/ppb_pdf.h" +#include "ui/aura/window.h" +#include "ui/aura/window_tree_host.h" #include "ui/base/resource/resource_bundle.h" +#include "ui/gfx/geometry/size.h" namespace athena { namespace { @@ -41,8 +44,8 @@ class AthenaDesktopController : public extensions::DesktopController { private: // extensions::DesktopController: - virtual aura::WindowTreeHost* GetHost() override { - return athena::AthenaEnv::Get()->GetHost(); + virtual gfx::Size GetWindowSize() override { + return athena::AthenaEnv::Get()->GetHost()->window()->bounds().size(); } // Creates a new app window and adds it to the desktop. The desktop maintains |