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

Unified Diff: chrome/browser/ui/ash/launcher/shell_window_launcher_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
« no previous file with comments | « ash/wm/workspace_controller.cc ('k') | chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h
===================================================================
--- chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h (revision 170746)
+++ chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h (working copy)
@@ -10,8 +10,8 @@
#include <string>
#include "chrome/browser/extensions/shell_window_registry.h"
-#include "ui/aura/client/activation_change_observer.h"
#include "ui/aura/window_observer.h"
+#include "ui/views/corewm/activation_change_shim.h"
namespace aura {
@@ -33,7 +33,7 @@
class ShellWindowLauncherController
: public extensions::ShellWindowRegistry::Observer,
public aura::WindowObserver,
- public aura::client::ActivationChangeObserver {
+ public views::corewm::ActivationChangeShim {
public:
explicit ShellWindowLauncherController(ChromeLauncherController* owner);
virtual ~ShellWindowLauncherController();
« no previous file with comments | « ash/wm/workspace_controller.cc ('k') | chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698