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

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

Issue 146363002: Linux Aura: Use system title bar is now set by preference, not flag. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Revert adding argument to FrameTypeChanged everywhere (thanks sky). Created 6 years, 10 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 584 matching lines...) Expand 10 before | Expand all | Expand 10 after
595 void DesktopWindowTreeHostX11::SetVisibilityChangedAnimationsEnabled( 595 void DesktopWindowTreeHostX11::SetVisibilityChangedAnimationsEnabled(
596 bool value) { 596 bool value) {
597 // Much like the previous NativeWidgetGtk, we don't have anything to do here. 597 // Much like the previous NativeWidgetGtk, we don't have anything to do here.
598 } 598 }
599 599
600 bool DesktopWindowTreeHostX11::ShouldUseNativeFrame() { 600 bool DesktopWindowTreeHostX11::ShouldUseNativeFrame() {
601 return use_native_frame_; 601 return use_native_frame_;
602 } 602 }
603 603
604 void DesktopWindowTreeHostX11::FrameTypeChanged() { 604 void DesktopWindowTreeHostX11::FrameTypeChanged() {
605 Widget::FrameType new_type =
606 native_widget_delegate_->AsWidget()->frame_type();
607 SetUseNativeFrame(new_type == Widget::FRAME_TYPE_FORCE_NATIVE);
605 // Replace the frame and layout the contents. Even though we don't have a 608 // Replace the frame and layout the contents. Even though we don't have a
606 // swapable glass frame like on Windows, we still replace the frame because 609 // swapable glass frame like on Windows, we still replace the frame because
607 // the button assets don't update otherwise. 610 // the button assets don't update otherwise.
608 native_widget_delegate_->AsWidget()->non_client_view()->UpdateFrame(); 611 native_widget_delegate_->AsWidget()->non_client_view()->UpdateFrame();
609 } 612 }
610 613
611 NonClientFrameView* DesktopWindowTreeHostX11::CreateNonClientFrameView() { 614 NonClientFrameView* DesktopWindowTreeHostX11::CreateNonClientFrameView() {
612 return NULL; 615 return NULL;
613 } 616 }
614 617
(...skipping 980 matching lines...) Expand 10 before | Expand all | Expand 10 after
1595 if (linux_ui) { 1598 if (linux_ui) {
1596 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme(); 1599 ui::NativeTheme* native_theme = linux_ui->GetNativeTheme();
1597 if (native_theme) 1600 if (native_theme)
1598 return native_theme; 1601 return native_theme;
1599 } 1602 }
1600 1603
1601 return ui::NativeTheme::instance(); 1604 return ui::NativeTheme::instance();
1602 } 1605 }
1603 1606
1604 } // namespace views 1607 } // namespace views
OLDNEW
« chrome/browser/ui/views/frame/browser_frame.cc ('K') | « chrome/common/chrome_switches.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698