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

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: Clear existing gpu testing switches before each test Created 4 years, 10 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 123 matching lines...) Expand 10 before | Expand all | Expand 10 after
134 134
135 #if defined(USE_X11) && !defined(OS_CHROMEOS) 135 #if defined(USE_X11) && !defined(OS_CHROMEOS)
136 #if defined(USE_ASH) 136 #if defined(USE_ASH)
137 if (GetInitialDesktop() == chrome::HOST_DESKTOP_TYPE_ASH) 137 if (GetInitialDesktop() == chrome::HOST_DESKTOP_TYPE_ASH)
138 return; 138 return;
139 #endif 139 #endif
140 views::LinuxUI::instance()->Initialize(); 140 views::LinuxUI::instance()->Initialize();
141 #endif 141 #endif
142 } 142 }
143 143
144 void ChromeBrowserMainExtraPartsAura::PreCreateThreads() { 144 void ChromeBrowserMainExtraPartsAura::PreCreateThreadsBegin() {
145 #if !defined(OS_CHROMEOS) 145 #if !defined(OS_CHROMEOS)
146 #if defined(USE_ASH) 146 #if defined(USE_ASH)
147 bool should_open_ash = chrome::ShouldOpenAshOnStartup(); 147 bool should_open_ash = chrome::ShouldOpenAshOnStartup();
148 #else 148 #else
149 bool should_open_ash = false; 149 bool should_open_ash = false;
150 #endif 150 #endif
151 if (!should_open_ash) { 151 if (!should_open_ash) {
152 gfx::Screen* screen = views::CreateDesktopScreen(); 152 gfx::Screen* screen = views::CreateDesktopScreen();
153 gfx::Screen::SetScreenInstance(screen); 153 gfx::Screen::SetScreenInstance(screen);
154 #if defined(USE_X11) 154 #if defined(USE_X11)
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
195 chrome::MESSAGE_BOX_TYPE_WARNING); 195 chrome::MESSAGE_BOX_TYPE_WARNING);
196 196
197 // Avoids gpu_process_transport_factory.cc(153)] Check failed: 197 // Avoids gpu_process_transport_factory.cc(153)] Check failed:
198 // per_compositor_data_.empty() when quit is chosen. 198 // per_compositor_data_.empty() when quit is chosen.
199 base::RunLoop().RunUntilIdle(); 199 base::RunLoop().RunUntilIdle();
200 200
201 exit(EXIT_FAILURE); 201 exit(EXIT_FAILURE);
202 } 202 }
203 } 203 }
204 #endif 204 #endif
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698