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

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

Issue 1608733002: Remove ui/gfx/screen_type_delegate.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@metro-mode-4
Patch Set: and another rebase Created 4 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
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 "build/build_config.h" 9 #include "build/build_config.h"
10 #include "chrome/browser/chrome_browser_main.h" 10 #include "chrome/browser/chrome_browser_main.h"
(...skipping 128 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 139
140 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() { 140 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() {
141 #if !defined(OS_CHROMEOS) 141 #if !defined(OS_CHROMEOS)
142 #if defined(USE_ASH) 142 #if defined(USE_ASH)
143 bool should_open_ash = chrome::ShouldOpenAshOnStartup(); 143 bool should_open_ash = chrome::ShouldOpenAshOnStartup();
144 #else 144 #else
145 bool should_open_ash = false; 145 bool should_open_ash = false;
146 #endif 146 #endif
147 if (!should_open_ash) { 147 if (!should_open_ash) {
148 gfx::Screen* screen = views::CreateDesktopScreen(); 148 gfx::Screen* screen = views::CreateDesktopScreen();
149 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen); 149 gfx::Screen::SetScreenInstance(screen);
150 #if defined(USE_X11) 150 #if defined(USE_X11)
151 views::LinuxUI::instance()->UpdateDeviceScaleFactor( 151 views::LinuxUI::instance()->UpdateDeviceScaleFactor(
152 screen->GetPrimaryDisplay().device_scale_factor()); 152 screen->GetPrimaryDisplay().device_scale_factor());
153 #endif 153 #endif
154 } 154 }
155 #endif 155 #endif
156 } 156 }
157 157
158 void ChromeBrowserMainExtraPartsAura::PreProfileInit() { 158 void ChromeBrowserMainExtraPartsAura::PreProfileInit() {
159 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 159 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 chrome::MESSAGE_BOX_TYPE_WARNING); 191 chrome::MESSAGE_BOX_TYPE_WARNING);
192 192
193 // Avoids gpu_process_transport_factory.cc(153)] Check failed: 193 // Avoids gpu_process_transport_factory.cc(153)] Check failed:
194 // per_compositor_data_.empty() when quit is chosen. 194 // per_compositor_data_.empty() when quit is chosen.
195 base::RunLoop().RunUntilIdle(); 195 base::RunLoop().RunUntilIdle();
196 196
197 exit(EXIT_FAILURE); 197 exit(EXIT_FAILURE);
198 } 198 }
199 } 199 }
200 #endif 200 #endif
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/multi_user/user_switch_animator_chromeos.cc ('k') | chrome/browser/ui/autofill/popup_view_common.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698