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

Unified Diff: ash/wm/workspace_controller.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
Index: ash/wm/workspace_controller.h
===================================================================
--- ash/wm/workspace_controller.h (revision 170620)
+++ ash/wm/workspace_controller.h (working copy)
@@ -9,7 +9,7 @@
#include "ash/wm/workspace/workspace_types.h"
#include "base/basictypes.h"
#include "base/memory/scoped_ptr.h"
-#include "ui/aura/client/activation_change_observer.h"
+#include "ui/views/corewm/activation_change_shim.h"
namespace aura {
class Window;
@@ -26,7 +26,7 @@
// WorkspaceController acts as a central place that ties together all the
// various workspace pieces.
class ASH_EXPORT WorkspaceController
- : public aura::client::ActivationChangeObserver {
+ : public views::corewm::ActivationChangeShim {
public:
explicit WorkspaceController(aura::Window* viewport);
virtual ~WorkspaceController();

Powered by Google App Engine
This is Rietveld 408576698