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

Issues Search
    My Issues | Starred     Open | Closed | All

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:
View side-by-side diff with in-line comments
Download patch
« ash/shell.cc ('K') | « ash/wm/panel_layout_manager.cc ('k') | ash/wm/shelf_layout_manager.cc » ('j') | ui/views/corewm/focus_change_shim.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/wm/shelf_layout_manager.h
===================================================================
--- ash/wm/shelf_layout_manager.h (revision 170620)
+++ 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.
« ash/shell.cc ('K') | « ash/wm/panel_layout_manager.cc ('k') | ash/wm/shelf_layout_manager.cc » ('j') | ui/views/corewm/focus_change_shim.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698