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

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: Rebase. Created 6 years, 11 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_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 234 matching lines...) Expand 10 before | Expand all | Expand 10 after
245 if (!params.child && params.parent) { 245 if (!params.child && params.parent) {
246 corewm::AddTransientChild(parent, content_window_); 246 corewm::AddTransientChild(parent, content_window_);
247 } 247 }
248 248
249 // Ensure that the X11DesktopHandler exists so that it dispatches activation 249 // Ensure that the X11DesktopHandler exists so that it dispatches activation
250 // messages to us. 250 // messages to us.
251 X11DesktopHandler::get(); 251 X11DesktopHandler::get();
252 252
253 // TODO(erg): Unify this code once the other consumer goes away. 253 // TODO(erg): Unify this code once the other consumer goes away.
254 x11_window_event_filter_.reset(new X11WindowEventFilter(root_window_, this)); 254 x11_window_event_filter_.reset(new X11WindowEventFilter(root_window_, this));
255 x11_window_event_filter_->SetUseHostWindowBorders(false); 255 x11_window_event_filter_->SetUseHostWindowBorders(
256 params.type == Widget::InitParams::TYPE_WINDOW &&
257 !params.remove_standard_frame);
256 desktop_native_widget_aura_->root_window_event_filter()->AddHandler( 258 desktop_native_widget_aura_->root_window_event_filter()->AddHandler(
257 x11_window_event_filter_.get()); 259 x11_window_event_filter_.get());
258 260
259 x11_window_move_client_.reset(new X11DesktopWindowMoveClient); 261 x11_window_move_client_.reset(new X11DesktopWindowMoveClient);
260 aura::client::SetWindowMoveClient(root_window_->window(), 262 aura::client::SetWindowMoveClient(root_window_->window(),
261 x11_window_move_client_.get()); 263 x11_window_move_client_.get());
262 264
263 native_widget_delegate_->OnNativeWidgetCreated(true); 265 native_widget_delegate_->OnNativeWidgetCreated(true);
264 } 266 }
265 267
(...skipping 1314 matching lines...) Expand 10 before | Expand all | Expand 10 after
1580 if (linux_ui) { 1582 if (linux_ui) {
1581 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1583 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1582 if (native_theme) 1584 if (native_theme)
1583 return native_theme; 1585 return native_theme;
1584 } 1586 }
1585 1587
1586 return ui::NativeTheme::instance(); 1588 return ui::NativeTheme::instance();
1587 } 1589 }
1588 1590
1589 } // namespace views 1591 } // namespace views
OLDNEW
« no previous file with comments | « chrome/common/chrome_switches.cc ('k') | ui/views/widget/desktop_aura/desktop_screen_x11_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698