OLD | NEW |
1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/chrome_browser_main_extra_parts_views_linux.h" | 5 #include "chrome/browser/ui/views/chrome_browser_main_extra_parts_views_linux.h" |
6 | 6 |
7 #include "base/run_loop.h" | 7 #include "base/run_loop.h" |
8 #include "chrome/browser/chrome_browser_main.h" | 8 #include "chrome/browser/chrome_browser_main.h" |
9 #include "chrome/browser/profiles/profile.h" | 9 #include "chrome/browser/profiles/profile.h" |
10 #include "chrome/browser/themes/theme_service.h" | 10 #include "chrome/browser/themes/theme_service.h" |
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
77 gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow)); | 77 gtk2_ui->SetNativeThemeOverride(base::Bind(&GetNativeThemeForWindow)); |
78 views::LinuxUI::SetInstance(gtk2_ui); | 78 views::LinuxUI::SetInstance(gtk2_ui); |
79 } | 79 } |
80 | 80 |
81 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() { | 81 void ChromeBrowserMainExtraPartsViewsLinux::ToolkitInitialized() { |
82 ChromeBrowserMainExtraPartsViews::ToolkitInitialized(); | 82 ChromeBrowserMainExtraPartsViews::ToolkitInitialized(); |
83 views::LinuxUI::instance()->Initialize(); | 83 views::LinuxUI::instance()->Initialize(); |
84 } | 84 } |
85 | 85 |
86 void ChromeBrowserMainExtraPartsViewsLinux::PreCreateThreads() { | 86 void ChromeBrowserMainExtraPartsViewsLinux::PreCreateThreads() { |
| 87 // Update the device scale factor before initializing views |
| 88 // because its display::Screen instance depends on it. |
| 89 views::LinuxUI::instance()->UpdateDeviceScaleFactor(); |
87 ChromeBrowserMainExtraPartsViews::PreCreateThreads(); | 90 ChromeBrowserMainExtraPartsViews::PreCreateThreads(); |
88 views::LinuxUI::instance()->UpdateDeviceScaleFactor( | |
89 display::Screen::GetScreen()->GetPrimaryDisplay().device_scale_factor()); | |
90 | |
91 views::X11DesktopHandler::get()->AddObserver(this); | 91 views::X11DesktopHandler::get()->AddObserver(this); |
92 } | 92 } |
93 | 93 |
94 void ChromeBrowserMainExtraPartsViewsLinux::OnWorkspaceChanged( | 94 void ChromeBrowserMainExtraPartsViewsLinux::OnWorkspaceChanged( |
95 const std::string& new_workspace) { | 95 const std::string& new_workspace) { |
96 BrowserList::MoveBrowsersInWorkspaceToFront(new_workspace); | 96 BrowserList::MoveBrowsersInWorkspaceToFront(new_workspace); |
97 } | 97 } |
OLD | NEW |