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

Side by Side Diff: chrome/browser/chrome_browser_main_win.cc

Issue 1547793004: Make gpu black list work again on Linux (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove changes from gpu_info_collector files 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/chrome_browser_main_win.h" 5 #include "chrome/browser/chrome_browser_main_win.h"
6 6
7 #include <windows.h> 7 #include <windows.h>
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #include <stddef.h> 9 #include <stddef.h>
10 10
(...skipping 284 matching lines...) Expand 10 before | Expand all | Expand 10 after
295 // setup.exe. In Chrome, these strings are in the locale files. 295 // setup.exe. In Chrome, these strings are in the locale files.
296 SetupInstallerUtilStrings(); 296 SetupInstallerUtilStrings();
297 297
298 ChromeBrowserMainParts::PreMainMessageLoopStart(); 298 ChromeBrowserMainParts::PreMainMessageLoopStart();
299 if (!parameters().ui_task) { 299 if (!parameters().ui_task) {
300 // Make sure that we know how to handle exceptions from the message loop. 300 // Make sure that we know how to handle exceptions from the message loop.
301 InitializeWindowProcExceptions(); 301 InitializeWindowProcExceptions();
302 } 302 }
303 } 303 }
304 304
305 int ChromeBrowserMainPartsWin::PreCreateThreads() { 305 int ChromeBrowserMainPartsWin::PreCreateThreadsBegin() {
306 int rv = ChromeBrowserMainParts::PreCreateThreads(); 306 int rv = ChromeBrowserMainParts::PreCreateThreadsBegin();
307 307
308 // TODO(viettrungluu): why don't we run this earlier? 308 // TODO(viettrungluu): why don't we run this earlier?
309 if (!parsed_command_line().HasSwitch(switches::kNoErrorDialogs) && 309 if (!parsed_command_line().HasSwitch(switches::kNoErrorDialogs) &&
310 base::win::GetVersion() < base::win::VERSION_XP) { 310 base::win::GetVersion() < base::win::VERSION_XP) {
311 chrome::ShowMessageBox(NULL, 311 chrome::ShowMessageBox(NULL,
312 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME), 312 l10n_util::GetStringUTF16(IDS_PRODUCT_NAME),
313 l10n_util::GetStringUTF16(IDS_UNSUPPORTED_OS_PRE_WIN_XP), 313 l10n_util::GetStringUTF16(IDS_UNSUPPORTED_OS_PRE_WIN_XP),
314 chrome::MESSAGE_BOX_TYPE_WARNING); 314 chrome::MESSAGE_BOX_TYPE_WARNING);
315 } 315 }
316 316
(...skipping 239 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 if (resource_id) 556 if (resource_id)
557 return l10n_util::GetStringUTF16(resource_id); 557 return l10n_util::GetStringUTF16(resource_id);
558 return base::string16(); 558 return base::string16();
559 } 559 }
560 560
561 // static 561 // static
562 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { 562 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
563 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); 563 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
564 installer::SetTranslationDelegate(&delegate); 564 installer::SetTranslationDelegate(&delegate);
565 } 565 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698