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

Unified Diff: content/shell/shell_stacking_client_ash.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
« no previous file with comments | « content/shell/shell_stacking_client_ash.h ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/shell/shell_stacking_client_ash.cc
===================================================================
--- content/shell/shell_stacking_client_ash.cc (revision 169818)
+++ content/shell/shell_stacking_client_ash.cc (working copy)
@@ -28,12 +28,11 @@
aura::Window* window,
const gfx::Rect& bounds) {
if (!root_window_.get()) {
- aura::FocusManager* focus_manager = new aura::FocusManager;
-
root_window_.reset(new aura::RootWindow(
aura::RootWindow::CreateParams(gfx::Rect(100, 100))));
root_window_->Init();
- root_window_->set_focus_manager(focus_manager);
+ focus_client_.reset(new aura::FocusManager);
+ aura::client::SetFocusClient(root_window_.get(), focus_client_.get());
root_window_event_filter_ = new views::corewm::CompoundEventFilter;
// Pass ownership of the filter to the root_window.
« no previous file with comments | « content/shell/shell_stacking_client_ash.h ('k') | ui/aura/aura.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698