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

Unified Diff: ash/wm/base_layout_manager.h

Issue 9696008: TestScreen shouldn't be marked aura export (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase again. Created 8 years, 9 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
« no previous file with comments | « ash/shell_observer.h ('k') | ash/wm/base_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/base_layout_manager.h
diff --git a/ash/wm/base_layout_manager.h b/ash/wm/base_layout_manager.h
index 79fd1fe6d262154cdf2fe38a1d10941874a94187..df858c8f66b72021e5012684550c1fde3e1899d2 100644
--- a/ash/wm/base_layout_manager.h
+++ b/ash/wm/base_layout_manager.h
@@ -9,6 +9,7 @@
#include <set>
#include "ash/ash_export.h"
+#include "ash/shell_observer.h"
#include "base/basictypes.h"
#include "base/compiler_specific.h"
#include "ui/aura/layout_manager.h"
@@ -29,6 +30,7 @@ namespace internal {
// properly.
class ASH_EXPORT BaseLayoutManager : public aura::LayoutManager,
public aura::RootWindowObserver,
+ public ash::ShellObserver,
public aura::WindowObserver {
public:
typedef std::set<aura::Window*> WindowSet;
@@ -49,6 +51,8 @@ class ASH_EXPORT BaseLayoutManager : public aura::LayoutManager,
// RootWindowObserver overrides:
virtual void OnRootWindowResized(const gfx::Size& new_size) OVERRIDE;
+
+ // ash::ShellObserver overrides:
virtual void OnScreenWorkAreaInsetsChanged() OVERRIDE;
// WindowObserver overrides:
« no previous file with comments | « ash/shell_observer.h ('k') | ash/wm/base_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698