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

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

Issue 72503002: Remove some pass-thrus on RootWindow API in favor of exposing the RootWindowHost again. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 7 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 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_native_widget_aura.h" 5 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/debug/trace_event.h" 8 #include "base/debug/trace_event.h"
9 #include "ui/aura/client/activation_client.h" 9 #include "ui/aura/client/activation_client.h"
10 #include "ui/aura/client/aura_constants.h" 10 #include "ui/aura/client/aura_constants.h"
(...skipping 1089 matching lines...) Expand 10 before | Expand all | Expand 10 after
1100 //////////////////////////////////////////////////////////////////////////////// 1100 ////////////////////////////////////////////////////////////////////////////////
1101 // DesktopNativeWidgetAura, NativeWidget implementation: 1101 // DesktopNativeWidgetAura, NativeWidget implementation:
1102 1102
1103 ui::EventHandler* DesktopNativeWidgetAura::GetEventHandler() { 1103 ui::EventHandler* DesktopNativeWidgetAura::GetEventHandler() {
1104 return this; 1104 return this;
1105 } 1105 }
1106 1106
1107 void DesktopNativeWidgetAura::InstallInputMethodEventFilter() { 1107 void DesktopNativeWidgetAura::InstallInputMethodEventFilter() {
1108 DCHECK(!input_method_event_filter_.get()); 1108 DCHECK(!input_method_event_filter_.get());
1109 1109
1110 input_method_event_filter_.reset( 1110 input_method_event_filter_.reset(new corewm::InputMethodEventFilter(
1111 new corewm::InputMethodEventFilter(root_window_->GetAcceleratedWidget())); 1111 root_window_->host()->GetAcceleratedWidget()));
1112 input_method_event_filter_->SetInputMethodPropertyInRootWindow( 1112 input_method_event_filter_->SetInputMethodPropertyInRootWindow(
1113 root_window_->window()); 1113 root_window_->window());
1114 root_window_event_filter_->AddHandler(input_method_event_filter_.get()); 1114 root_window_event_filter_->AddHandler(input_method_event_filter_.get());
1115 } 1115 }
1116 1116
1117 void DesktopNativeWidgetAura::UpdateWindowTransparency() { 1117 void DesktopNativeWidgetAura::UpdateWindowTransparency() {
1118 content_window_->SetTransparent(ShouldUseNativeFrame()); 1118 content_window_->SetTransparent(ShouldUseNativeFrame());
1119 } 1119 }
1120 1120
1121 } // namespace views 1121 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_drop_target_win.cc ('k') | ui/views/widget/desktop_aura/desktop_root_window_host_win.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698