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

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

Issue 49303007: Moves responsibility of invoking OnNativeWidgetCreated to DesktopRootWindowHost (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge 2 trunk 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
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_win_unittest.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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_x11.h" 5 #include "ui/views/widget/desktop_aura/desktop_root_window_host_x11.h"
6 6
7 #include <X11/extensions/shape.h> 7 #include <X11/extensions/shape.h>
8 #include <X11/extensions/XInput2.h> 8 #include <X11/extensions/XInput2.h>
9 #include <X11/Xatom.h> 9 #include <X11/Xatom.h>
10 #include <X11/Xregion.h> 10 #include <X11/Xregion.h>
(...skipping 222 matching lines...) Expand 10 before | Expand all | Expand 10 after
233 233
234 // TODO(erg): Unify this code once the other consumer goes away. 234 // TODO(erg): Unify this code once the other consumer goes away.
235 x11_window_event_filter_.reset(new X11WindowEventFilter(root_window_)); 235 x11_window_event_filter_.reset(new X11WindowEventFilter(root_window_));
236 x11_window_event_filter_->SetUseHostWindowBorders(false); 236 x11_window_event_filter_->SetUseHostWindowBorders(false);
237 desktop_native_widget_aura_->root_window_event_filter()->AddHandler( 237 desktop_native_widget_aura_->root_window_event_filter()->AddHandler(
238 x11_window_event_filter_.get()); 238 x11_window_event_filter_.get());
239 239
240 x11_window_move_client_.reset(new X11DesktopWindowMoveClient); 240 x11_window_move_client_.reset(new X11DesktopWindowMoveClient);
241 aura::client::SetWindowMoveClient(root_window_, 241 aura::client::SetWindowMoveClient(root_window_,
242 x11_window_move_client_.get()); 242 x11_window_move_client_.get());
243
244 native_widget_delegate_->OnNativeWidgetCreated(true);
243 } 245 }
244 246
245 scoped_ptr<corewm::Tooltip> DesktopRootWindowHostX11::CreateTooltip() { 247 scoped_ptr<corewm::Tooltip> DesktopRootWindowHostX11::CreateTooltip() {
246 return scoped_ptr<corewm::Tooltip>( 248 return scoped_ptr<corewm::Tooltip>(
247 new corewm::TooltipAura(gfx::SCREEN_TYPE_NATIVE)); 249 new corewm::TooltipAura(gfx::SCREEN_TYPE_NATIVE));
248 } 250 }
249 251
250 scoped_ptr<aura::client::DragDropClient> 252 scoped_ptr<aura::client::DragDropClient>
251 DesktopRootWindowHostX11::CreateDragDropClient( 253 DesktopRootWindowHostX11::CreateDragDropClient(
252 DesktopNativeCursorManager* cursor_manager) { 254 DesktopNativeCursorManager* cursor_manager) {
(...skipping 1164 matching lines...) Expand 10 before | Expand all | Expand 10 after
1417 if (linux_ui) { 1419 if (linux_ui) {
1418 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1420 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1419 if (native_theme) 1421 if (native_theme)
1420 return native_theme; 1422 return native_theme;
1421 } 1423 }
1422 1424
1423 return ui::NativeTheme::instance(); 1425 return ui::NativeTheme::instance();
1424 } 1426 }
1425 1427
1426 } // namespace views 1428 } // namespace views
OLDNEW
« no previous file with comments | « ui/views/widget/desktop_aura/desktop_root_window_host_win_unittest.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698