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

Side by Side Diff: chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.cc

Issue 929733002: Fix Pango font rendering with HiDPi displays on Linux. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Pango font rendering with HiDPi displays on Linux. Created 5 years, 9 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
« no previous file with comments | « no previous file | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h" 5 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "chrome/browser/chrome_browser_main.h" 9 #include "chrome/browser/chrome_browser_main.h"
10 #include "chrome/browser/ui/aura/active_desktop_monitor.h" 10 #include "chrome/browser/ui/aura/active_desktop_monitor.h"
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 views::LinuxUI::instance()->Initialize(); 116 views::LinuxUI::instance()->Initialize();
117 #endif 117 #endif
118 } 118 }
119 119
120 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() { 120 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() {
121 #if !defined(OS_CHROMEOS) 121 #if !defined(OS_CHROMEOS)
122 #if defined(USE_ASH) 122 #if defined(USE_ASH)
123 if (!chrome::ShouldOpenAshOnStartup()) 123 if (!chrome::ShouldOpenAshOnStartup())
124 #endif 124 #endif
125 { 125 {
126 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, 126 gfx::Screen* screen = views::CreateDesktopScreen();
127 views::CreateDesktopScreen()); 127 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen);
128 #if defined(USE_X11)
129 views::LinuxUI::instance()->UpdateDeviceScaleFactor(
130 screen->GetPrimaryDisplay().device_scale_factor());
131 #endif
128 } 132 }
129 #endif 133 #endif
130 } 134 }
131 135
132 void ChromeBrowserMainExtraPartsAura::PreProfileInit() { 136 void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
133 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 137 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
134 // Now that we have some minimal ui initialized, check to see if we're 138 // Now that we have some minimal ui initialized, check to see if we're
135 // running as root and bail if we are. 139 // running as root and bail if we are.
136 DetectRunningAsRoot(); 140 DetectRunningAsRoot();
137 #endif 141 #endif
(...skipping 27 matching lines...) Expand all
165 chrome::MESSAGE_BOX_TYPE_WARNING); 169 chrome::MESSAGE_BOX_TYPE_WARNING);
166 170
167 // Avoids gpu_process_transport_factory.cc(153)] Check failed: 171 // Avoids gpu_process_transport_factory.cc(153)] Check failed:
168 // per_compositor_data_.empty() when quit is chosen. 172 // per_compositor_data_.empty() when quit is chosen.
169 base::RunLoop().RunUntilIdle(); 173 base::RunLoop().RunUntilIdle();
170 174
171 exit(EXIT_FAILURE); 175 exit(EXIT_FAILURE);
172 } 176 }
173 } 177 }
174 #endif 178 #endif
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/libgtk2ui/gtk2_ui.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698