ash/wm/base_layout_manager.h - Issue 9616045: Aura/Ash split: Move ScreenAura to ash::ScreenAsh.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: ash/wm/base_layout_manager.h

Issue 9616045: Aura/Ash split: Move ScreenAura to ash::ScreenAsh. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Use a separate aura::TestScreen in tests instead, partially reverting to patchset 2 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:

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 »