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

Side by Side Diff: views/desktop/desktop_window_view.cc

Issue 7464027: Wayland support for views. views_desktop on Wayland. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Updated native_widget_wayland.cc to match compositor changes Created 9 years, 3 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
« no previous file with comments | « views/desktop/desktop_main.cc ('k') | views/events/event_wayland.cc » ('j') | 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 "views/desktop/desktop_window_view.h" 5 #include "views/desktop/desktop_window_view.h"
6 6
7 #include "ui/gfx/canvas.h" 7 #include "ui/gfx/canvas.h"
8 #include "ui/gfx/transform.h" 8 #include "ui/gfx/transform.h"
9 #include "views/desktop/desktop_background.h" 9 #include "views/desktop/desktop_background.h"
10 #include "views/desktop/desktop_window_root_view.h" 10 #include "views/desktop/desktop_window_root_view.h"
11 #include "views/desktop/desktop_window_manager.h" 11 #include "views/desktop/desktop_window_manager.h"
12 #include "views/layer_property_setter.h" 12 #include "views/layer_property_setter.h"
13 #include "views/widget/native_widget_view.h" 13 #include "views/widget/native_widget_view.h"
14 #include "views/widget/native_widget_views.h" 14 #include "views/widget/native_widget_views.h"
15 #include "views/widget/widget.h" 15 #include "views/widget/widget.h"
16 #include "views/window/native_frame_view.h" 16 #include "views/window/native_frame_view.h"
17 17
18 #if defined(USE_AURA) 18 #if defined(USE_AURA)
19 #include "views/widget/native_widget_aura.h" 19 #include "views/widget/native_widget_aura.h"
20 #elif defined(OS_WIN) 20 #elif defined(OS_WIN)
21 #include "views/widget/native_widget_win.h" 21 #include "views/widget/native_widget_win.h"
22 #elif defined(USE_WAYLAND)
23 #include "views/widget/native_widget_wayland.h"
22 #elif defined(TOOLKIT_USES_GTK) 24 #elif defined(TOOLKIT_USES_GTK)
23 #include "views/widget/native_widget_gtk.h" 25 #include "views/widget/native_widget_gtk.h"
24 #endif 26 #endif
25 27
26 namespace views { 28 namespace views {
27 namespace desktop { 29 namespace desktop {
28 30
29 // The Widget that hosts the DesktopWindowView. Subclasses Widget to override 31 // The Widget that hosts the DesktopWindowView. Subclasses Widget to override
30 // CreateRootView() so that the DesktopWindowRootView can be supplied instead 32 // CreateRootView() so that the DesktopWindowRootView can be supplied instead
31 // for custom event filtering. 33 // for custom event filtering.
(...skipping 104 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 138
137 views::Widget::InitParams params; 139 views::Widget::InitParams params;
138 params.delegate = desktop_window_view; 140 params.delegate = desktop_window_view;
139 // In this environment, CreateChromeWindow will default to creating a views- 141 // In this environment, CreateChromeWindow will default to creating a views-
140 // window, so we need to construct a NativeWidgetWin by hand. 142 // window, so we need to construct a NativeWidgetWin by hand.
141 // TODO(beng): Replace this with NativeWindow::CreateNativeRootWindow(). 143 // TODO(beng): Replace this with NativeWindow::CreateNativeRootWindow().
142 #if defined(USE_AURA) 144 #if defined(USE_AURA)
143 params.native_widget = new views::NativeWidgetAura(window); 145 params.native_widget = new views::NativeWidgetAura(window);
144 #elif defined(OS_WIN) 146 #elif defined(OS_WIN)
145 params.native_widget = new views::NativeWidgetWin(window); 147 params.native_widget = new views::NativeWidgetWin(window);
148 #elif defined(USE_WAYLAND)
149 params.native_widget = new views::NativeWidgetWayland(window);
146 #elif defined(TOOLKIT_USES_GTK) 150 #elif defined(TOOLKIT_USES_GTK)
147 params.native_widget = new views::NativeWidgetGtk(window); 151 params.native_widget = new views::NativeWidgetGtk(window);
148 params.maximize = true; 152 params.maximize = true;
149 #endif 153 #endif
150 params.bounds = gfx::Rect(20, 20, 1920, 1200); 154 params.bounds = gfx::Rect(20, 20, 1920, 1200);
151 window->Init(params); 155 window->Init(params);
152 window->Show(); 156 window->Show();
153 } 157 }
154 158
155 void DesktopWindowView::ActivateWidget(Widget* widget) { 159 void DesktopWindowView::ActivateWidget(Widget* widget) {
(...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after
276 active_native_widget_->GetWidget()->Deactivate(); 280 active_native_widget_->GetWidget()->Deactivate();
277 active_native_widget_ = 281 active_native_widget_ =
278 static_cast<NativeWidgetViews*>(widget->native_widget()); 282 static_cast<NativeWidgetViews*>(widget->native_widget());
279 } else if (widget == active_native_widget_->GetWidget()) { 283 } else if (widget == active_native_widget_->GetWidget()) {
280 active_native_widget_ = NULL; 284 active_native_widget_ = NULL;
281 } 285 }
282 } 286 }
283 287
284 } // namespace desktop 288 } // namespace desktop
285 } // namespace views 289 } // namespace views
OLDNEW
« no previous file with comments | « views/desktop/desktop_main.cc ('k') | views/events/event_wayland.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698