| OLD | NEW |
| 1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 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 "chrome/browser/ui/views/frame/desktop_browser_frame_auralinux.h" | 5 #include "chrome/browser/ui/views/frame/desktop_browser_frame_aurax11.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/shell_integration_linux.h" | 8 #include "chrome/browser/shell_integration_linux.h" |
| 9 #include "chrome/browser/ui/views/frame/browser_frame.h" | 9 #include "chrome/browser/ui/views/frame/browser_frame.h" |
| 10 #include "chrome/browser/ui/views/frame/browser_view.h" | 10 #include "chrome/browser/ui/views/frame/browser_view.h" |
| 11 #include "chrome/common/chrome_switches.h" | 11 #include "chrome/common/chrome_switches.h" |
| 12 #include "chrome/common/pref_names.h" | 12 #include "chrome/common/pref_names.h" |
| 13 #include "ui/views/widget/widget.h" | 13 #include "ui/views/widget/widget.h" |
| 14 | 14 |
| 15 DesktopBrowserFrameAuraLinux::DesktopBrowserFrameAuraLinux( | 15 DesktopBrowserFrameAuraX11::DesktopBrowserFrameAuraX11( |
| 16 BrowserFrame* browser_frame, | 16 BrowserFrame* browser_frame, |
| 17 BrowserView* browser_view) | 17 BrowserView* browser_view) |
| 18 : DesktopBrowserFrameAura(browser_frame, browser_view) { | 18 : DesktopBrowserFrameAura(browser_frame, browser_view) { |
| 19 use_custom_frame_pref_.Init( | 19 use_custom_frame_pref_.Init( |
| 20 prefs::kUseCustomChromeFrame, | 20 prefs::kUseCustomChromeFrame, |
| 21 browser_view->browser()->profile()->GetPrefs(), | 21 browser_view->browser()->profile()->GetPrefs(), |
| 22 base::Bind(&DesktopBrowserFrameAuraLinux::OnUseCustomChromeFrameChanged, | 22 base::Bind(&DesktopBrowserFrameAuraX11::OnUseCustomChromeFrameChanged, |
| 23 base::Unretained(this))); | 23 base::Unretained(this))); |
| 24 } | 24 } |
| 25 | 25 |
| 26 DesktopBrowserFrameAuraLinux::~DesktopBrowserFrameAuraLinux() { | 26 DesktopBrowserFrameAuraX11::~DesktopBrowserFrameAuraX11() { |
| 27 } | 27 } |
| 28 | 28 |
| 29 views::Widget::InitParams DesktopBrowserFrameAuraLinux::GetWidgetParams() { | 29 views::Widget::InitParams DesktopBrowserFrameAuraX11::GetWidgetParams() { |
| 30 views::Widget::InitParams params; | 30 views::Widget::InitParams params; |
| 31 params.native_widget = this; | 31 params.native_widget = this; |
| 32 | 32 |
| 33 // Set up a custom WM_CLASS for some sorts of window types. This allows | 33 // Set up a custom WM_CLASS for some sorts of window types. This allows |
| 34 // task switchers in X11 environments to distinguish between main browser | 34 // task switchers in X11 environments to distinguish between main browser |
| 35 // windows and e.g app windows. | 35 // windows and e.g app windows. |
| 36 const Browser& browser = *browser_view()->browser(); | 36 const Browser& browser = *browser_view()->browser(); |
| 37 params.wm_class_name = | 37 params.wm_class_name = |
| 38 browser.is_app() && !browser.is_devtools() | 38 browser.is_app() && !browser.is_devtools() |
| 39 ? web_app::GetWMClassFromAppName(browser.app_name()) | 39 ? web_app::GetWMClassFromAppName(browser.app_name()) |
| 40 // This window is a hosted app or v1 packaged app. | 40 // This window is a hosted app or v1 packaged app. |
| 41 // NOTE: v2 packaged app windows are created by | 41 // NOTE: v2 packaged app windows are created by |
| 42 // ChromeNativeAppWindowViews. | 42 // ChromeNativeAppWindowViews. |
| 43 : shell_integration_linux::GetProgramClassName(); | 43 : shell_integration_linux::GetProgramClassName(); |
| 44 params.wm_class_class = shell_integration_linux::GetProgramClassClass(); | 44 params.wm_class_class = shell_integration_linux::GetProgramClassClass(); |
| 45 const char kX11WindowRoleBrowser[] = "browser"; | 45 const char kX11WindowRoleBrowser[] = "browser"; |
| 46 const char kX11WindowRolePopup[] = "pop-up"; | 46 const char kX11WindowRolePopup[] = "pop-up"; |
| 47 params.wm_role_name = browser_view()->browser()->is_type_tabbed() | 47 params.wm_role_name = browser_view()->browser()->is_type_tabbed() |
| 48 ? std::string(kX11WindowRoleBrowser) | 48 ? std::string(kX11WindowRoleBrowser) |
| 49 : std::string(kX11WindowRolePopup); | 49 : std::string(kX11WindowRolePopup); |
| 50 params.remove_standard_frame = UseCustomFrame(); | 50 params.remove_standard_frame = UseCustomFrame(); |
| 51 | 51 |
| 52 return params; | 52 return params; |
| 53 } | 53 } |
| 54 | 54 |
| 55 bool DesktopBrowserFrameAuraLinux::UseCustomFrame() const { | 55 bool DesktopBrowserFrameAuraX11::UseCustomFrame() const { |
| 56 return use_custom_frame_pref_.GetValue() && | 56 return use_custom_frame_pref_.GetValue() && |
| 57 browser_view()->IsBrowserTypeNormal(); | 57 browser_view()->IsBrowserTypeNormal(); |
| 58 } | 58 } |
| 59 | 59 |
| 60 void DesktopBrowserFrameAuraLinux::OnUseCustomChromeFrameChanged() { | 60 void DesktopBrowserFrameAuraX11::OnUseCustomChromeFrameChanged() { |
| 61 // Tell the window manager to add or remove system borders. | 61 // Tell the window manager to add or remove system borders. |
| 62 browser_frame()->set_frame_type( | 62 browser_frame()->set_frame_type( |
| 63 UseCustomFrame() ? views::Widget::FRAME_TYPE_FORCE_CUSTOM | 63 UseCustomFrame() ? views::Widget::FRAME_TYPE_FORCE_CUSTOM |
| 64 : views::Widget::FRAME_TYPE_FORCE_NATIVE); | 64 : views::Widget::FRAME_TYPE_FORCE_NATIVE); |
| 65 browser_frame()->FrameTypeChanged(); | 65 browser_frame()->FrameTypeChanged(); |
| 66 } | 66 } |
| OLD | NEW |