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

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

Issue 111723012: Linux Aura: Added --use-system-title-bar flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Formatting. Created 7 years 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_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 232 matching lines...) Expand 10 before | Expand all | Expand 10 after
243 gfx::NativeView parent = params.parent; 243 gfx::NativeView parent = params.parent;
244 if (!params.child && params.parent) 244 if (!params.child && params.parent)
245 parent->AddTransientChild(content_window_); 245 parent->AddTransientChild(content_window_);
246 246
247 // Ensure that the X11DesktopHandler exists so that it dispatches activation 247 // Ensure that the X11DesktopHandler exists so that it dispatches activation
248 // messages to us. 248 // messages to us.
249 X11DesktopHandler::get(); 249 X11DesktopHandler::get();
250 250
251 // TODO(erg): Unify this code once the other consumer goes away. 251 // TODO(erg): Unify this code once the other consumer goes away.
252 x11_window_event_filter_.reset(new X11WindowEventFilter(root_window_, this)); 252 x11_window_event_filter_.reset(new X11WindowEventFilter(root_window_, this));
253 x11_window_event_filter_->SetUseHostWindowBorders(false); 253 x11_window_event_filter_->SetUseHostWindowBorders(
254 params.type == Widget::InitParams::TYPE_WINDOW &&
255 !params.remove_standard_frame);
254 desktop_native_widget_aura_->root_window_event_filter()->AddHandler( 256 desktop_native_widget_aura_->root_window_event_filter()->AddHandler(
255 x11_window_event_filter_.get()); 257 x11_window_event_filter_.get());
256 258
257 x11_window_move_client_.reset(new X11DesktopWindowMoveClient); 259 x11_window_move_client_.reset(new X11DesktopWindowMoveClient);
258 aura::client::SetWindowMoveClient(root_window_->window(), 260 aura::client::SetWindowMoveClient(root_window_->window(),
259 x11_window_move_client_.get()); 261 x11_window_move_client_.get());
260 262
261 native_widget_delegate_->OnNativeWidgetCreated(true); 263 native_widget_delegate_->OnNativeWidgetCreated(true);
262 } 264 }
263 265
(...skipping 1275 matching lines...) Expand 10 before | Expand all | Expand 10 after
1539 if (linux_ui) { 1541 if (linux_ui) {
1540 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1542 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1541 if (native_theme) 1543 if (native_theme)
1542 return native_theme; 1544 return native_theme;
1543 } 1545 }
1544 1546
1545 return ui::NativeTheme::instance(); 1547 return ui::NativeTheme::instance();
1546 } 1548 }
1547 1549
1548 } // namespace views 1550 } // namespace views
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698