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

Unified Diff: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

Issue 11299219: Rework FocusManager as FocusClient. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 1 month 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: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc
===================================================================
--- ui/views/widget/desktop_aura/desktop_root_window_host_win.cc (revision 169818)
+++ ui/views/widget/desktop_aura/desktop_root_window_host_win.cc (working copy)
@@ -117,8 +117,8 @@
capture_client_.reset(new aura::client::DefaultCaptureClient(root_window_));
aura::client::SetCaptureClient(root_window_, capture_client_.get());
- focus_manager_.reset(new aura::FocusManager);
- root_window_->set_focus_manager(focus_manager_.get());
+ focus_client_.reset(new aura::FocusManager);
+ aura::client::SetFocusClient(root_window_, focus_client_.get());
activation_client_.reset(new DesktopActivationClient(root_window_));
@@ -144,7 +144,7 @@
input_method_filter_->SetInputMethodPropertyInRootWindow(root_window_);
root_window_event_filter_->AddHandler(input_method_filter_.get());
- focus_manager_->SetFocusedWindow(content_window_, NULL);
+ focus_client_->FocusWindow(content_window_, NULL);
root_window_->SetProperty(kContentWindowForRootWindow, content_window_);
ui_controls::InstallUIControlsAura(CreateUIControlsAura(root_window_));
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_win.h ('k') | ui/views/widget/desktop_aura/desktop_stacking_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698