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

Unified Diff: ash/wm/panel_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:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ash/wm/ash_focus_rules.cc ('k') | ash/wm/panel_layout_manager.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/panel_layout_manager.h
===================================================================
--- ash/wm/panel_layout_manager.h (revision 170746)
+++ ash/wm/panel_layout_manager.h (working copy)
@@ -13,9 +13,9 @@
#include "base/compiler_specific.h"
#include "base/memory/scoped_ptr.h"
#include "base/memory/weak_ptr.h"
-#include "ui/aura/client/activation_change_observer.h"
#include "ui/aura/layout_manager.h"
#include "ui/aura/window_observer.h"
+#include "ui/views/corewm/activation_change_shim.h"
namespace aura {
class Window;
@@ -47,7 +47,7 @@
: public aura::LayoutManager,
public ash::LauncherIconObserver,
public aura::WindowObserver,
- public aura::client::ActivationChangeObserver {
+ public views::corewm::ActivationChangeShim {
public:
explicit PanelLayoutManager(aura::Window* panel_container);
virtual ~PanelLayoutManager();
« no previous file with comments | « ash/wm/ash_focus_rules.cc ('k') | ash/wm/panel_layout_manager.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698