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

Side by Side Diff: ui/views/widget/desktop_aura/desktop_root_window_host_win.cc

Issue 25445002: Ensure that in Desktop AURA the WindowModalityController class is at the head of the event pre targ… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h" 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_win.h"
6 6
7 #include "base/win/metro.h" 7 #include "base/win/metro.h"
8 #include "third_party/skia/include/core/SkPath.h" 8 #include "third_party/skia/include/core/SkPath.h"
9 #include "third_party/skia/include/core/SkRegion.h" 9 #include "third_party/skia/include/core/SkRegion.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 message_handler_->Init(parent_hwnd, pixel_bounds); 116 message_handler_->Init(parent_hwnd, pixel_bounds);
117 117
118 aura::RootWindow::CreateParams rw_params(params.bounds); 118 aura::RootWindow::CreateParams rw_params(params.bounds);
119 rw_params.host = this; 119 rw_params.host = this;
120 root_window_ = new aura::RootWindow(rw_params); 120 root_window_ = new aura::RootWindow(rw_params);
121 121
122 SetWindowTransparency(); 122 SetWindowTransparency();
123 root_window_->Init(); 123 root_window_->Init();
124 root_window_->AddChild(content_window_); 124 root_window_->AddChild(content_window_);
125 125
126 desktop_native_widget_aura_->InstallWindowModalityController(root_window_);
126 desktop_native_widget_aura_->CreateCaptureClient(root_window_); 127 desktop_native_widget_aura_->CreateCaptureClient(root_window_);
127 128
128 corewm::FocusController* focus_controller = 129 corewm::FocusController* focus_controller =
129 new corewm::FocusController(new DesktopFocusRules(content_window)); 130 new corewm::FocusController(new DesktopFocusRules(content_window));
130 focus_client_.reset(focus_controller); 131 focus_client_.reset(focus_controller);
131 aura::client::SetFocusClient(root_window_, focus_controller); 132 aura::client::SetFocusClient(root_window_, focus_controller);
132 aura::client::SetActivationClient(root_window_, focus_controller); 133 aura::client::SetActivationClient(root_window_, focus_controller);
133 root_window_->AddPreTargetHandler(focus_controller); 134 root_window_->AddPreTargetHandler(focus_controller);
134 135
135 dispatcher_client_.reset(new DesktopDispatcherClient); 136 dispatcher_client_.reset(new DesktopDispatcherClient);
(...skipping 720 matching lines...) Expand 10 before | Expand all | Expand 10 after
856 DesktopRootWindowHost* DesktopRootWindowHost::Create( 857 DesktopRootWindowHost* DesktopRootWindowHost::Create(
857 internal::NativeWidgetDelegate* native_widget_delegate, 858 internal::NativeWidgetDelegate* native_widget_delegate,
858 DesktopNativeWidgetAura* desktop_native_widget_aura, 859 DesktopNativeWidgetAura* desktop_native_widget_aura,
859 const gfx::Rect& initial_bounds) { 860 const gfx::Rect& initial_bounds) {
860 return new DesktopRootWindowHostWin(native_widget_delegate, 861 return new DesktopRootWindowHostWin(native_widget_delegate,
861 desktop_native_widget_aura, 862 desktop_native_widget_aura,
862 initial_bounds); 863 initial_bounds);
863 } 864 }
864 865
865 } // namespace views 866 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698