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

Unified Diff: chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc

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: chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc
===================================================================
--- chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc (revision 170746)
+++ chrome/browser/ui/ash/launcher/shell_window_launcher_controller.cc (working copy)
@@ -184,7 +184,9 @@
ShellWindowLauncherController::ShellWindowLauncherController(
ChromeLauncherController* owner)
- : owner_(owner),
+ : ActivationChangeShim(ash::Shell::HasInstance() ?
+ ash::Shell::GetInstance() : NULL),
+ owner_(owner),
registry_(extensions::ShellWindowRegistry::Get(owner->profile())),
activation_client_(NULL) {
registry_->AddObserver(this);
« no previous file with comments | « chrome/browser/ui/ash/launcher/shell_window_launcher_controller.h ('k') | ui/views/controls/menu/menu_controller_aura.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698