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

Unified Diff: apps/shell/browser/shell_desktop_controller.cc

Issue 306083005: Replace the HomeCard by the AppList in Athena. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix for focus_controller Created 6 years, 7 months 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 | « no previous file | athena/athena.gyp » ('j') | athena/home/app_list_view_delegate.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/browser/shell_desktop_controller.cc
diff --git a/apps/shell/browser/shell_desktop_controller.cc b/apps/shell/browser/shell_desktop_controller.cc
index 752b198a9d02867297f6eb6ca8c56751657f313c..26760407207364d1df1eaf7dfffe31a4363413ca 100644
--- a/apps/shell/browser/shell_desktop_controller.cc
+++ b/apps/shell/browser/shell_desktop_controller.cc
@@ -253,8 +253,11 @@ void ShellDesktopController::CreateRootWindow() {
}
void ShellDesktopController::InitWindowManager() {
- focus_client_.reset(new wm::FocusController(new AppsFocusRules()));
- aura::client::SetFocusClient(host_->window(), focus_client_.get());
+ wm::FocusController* focus_controller =
+ new wm::FocusController(new AppsFocusRules());
+ aura::client::SetFocusClient(host_->window(), focus_controller);
+ host_->window()->AddPreTargetHandler(focus_controller);
+ focus_client_.reset(focus_controller);
input_method_filter_.reset(
new wm::InputMethodEventFilter(host_->GetAcceleratedWidget()));
« no previous file with comments | « no previous file | athena/athena.gyp » ('j') | athena/home/app_list_view_delegate.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698