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

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

Issue 1547793004: Make gpu black list work again on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 #if defined(USE_X11) && !defined(OS_CHROMEOS) 120 #if defined(USE_X11) && !defined(OS_CHROMEOS)
121 #if defined(USE_ASH) 121 #if defined(USE_ASH)
122 if (GetInitialDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) 122 if (GetInitialDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
123 return; 123 return;
124 #endif 124 #endif
125 views::LinuxUI::instance()->Initialize(); 125 views::LinuxUI::instance()->Initialize();
126 #endif 126 #endif
127 } 127 }
128 128
129 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() { 129 void ChromeBrowserMainExtraPartsAura::PreCreateThreadsBegin() {
130 #if !defined(OS_CHROMEOS) 130 #if !defined(OS_CHROMEOS)
131 #if defined(USE_ASH) 131 #if defined(USE_ASH)
132 bool should_open_ash = chrome::ShouldOpenAshOnStartup(); 132 bool should_open_ash = chrome::ShouldOpenAshOnStartup();
133 #else 133 #else
134 bool should_open_ash = false; 134 bool should_open_ash = false;
135 #endif 135 #endif
136 if (!should_open_ash) { 136 if (!should_open_ash) {
137 gfx::Screen* screen = views::CreateDesktopScreen(); 137 gfx::Screen* screen = views::CreateDesktopScreen();
138 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen); 138 gfx::Screen::SetScreenInstance(gfx::SCREEN_TYPE_NATIVE, screen);
139 #if defined(USE_X11) 139 #if defined(USE_X11)
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 chrome::MESSAGE_BOX_TYPE_WARNING); 180 chrome::MESSAGE_BOX_TYPE_WARNING);
181 181
182 // Avoids gpu_process_transport_factory.cc(153)] Check failed: 182 // Avoids gpu_process_transport_factory.cc(153)] Check failed:
183 // per_compositor_data_.empty() when quit is chosen. 183 // per_compositor_data_.empty() when quit is chosen.
184 base::RunLoop().RunUntilIdle(); 184 base::RunLoop().RunUntilIdle();
185 185
186 exit(EXIT_FAILURE); 186 exit(EXIT_FAILURE);
187 } 187 }
188 } 188 }
189 #endif 189 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698