ash/wm/shelf_layout_manager.h - Issue 11421194: Hook up the FocusController behind a flag.

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/shelf_layout_manager.h

Issue 11421194: Hook up the FocusController behind a flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 8 years 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/shelf_layout_manager.h

===================================================================

--- ash/wm/shelf_layout_manager.h (revision 170746)

+++ ash/wm/shelf_layout_manager.h (working copy)

@@ -14,10 +14,10 @@

#include "base/gtest_prod_util.h"

#include "base/observer_list.h"

#include "base/timer.h"

-#include "ui/aura/client/activation_change_observer.h"

#include "ui/aura/layout_manager.h"

#include "ui/gfx/insets.h"

#include "ui/gfx/rect.h"

+#include "ui/views/corewm/activation_change_shim.h"

namespace aura {

class RootWindow;

@@ -44,7 +44,7 @@

class ASH_EXPORT ShelfLayoutManager :

public aura::LayoutManager,

public ash::ShellObserver,

- public aura::client::ActivationChangeObserver {

+ public views::corewm::ActivationChangeShim {

public:

enum VisibilityState {

// Completely visible.

« no previous file with comments | « ash/wm/panel_layout_manager.cc ('k') | ash/wm/shelf_layout_manager.cc » ('j') | no next file with comments »