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

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

Issue 804263005: Removing --assert-test commandline flag (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed build errors Created 5 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
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | content/public/common/content_switches.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/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 9
10 #include <algorithm> 10 #include <algorithm>
(...skipping 292 matching lines...) Expand 10 before | Expand all | Expand 10 after
303 scoped_ptr<base::Environment> env(base::Environment::Create()); 303 scoped_ptr<base::Environment> env(base::Environment::Create());
304 env->UnSetVar(env_vars::kShowRestart); 304 env->UnSetVar(env_vars::kShowRestart);
305 305
306 // For non-interactive tests we don't restart on crash. 306 // For non-interactive tests we don't restart on crash.
307 if (env->HasVar(env_vars::kHeadless)) 307 if (env->HasVar(env_vars::kHeadless))
308 return; 308 return;
309 309
310 // If the known command-line test options are used we don't create the 310 // If the known command-line test options are used we don't create the
311 // environment block which means we don't get the restart dialog. 311 // environment block which means we don't get the restart dialog.
312 if (parsed_command_line.HasSwitch(switches::kBrowserCrashTest) || 312 if (parsed_command_line.HasSwitch(switches::kBrowserCrashTest) ||
313 parsed_command_line.HasSwitch(switches::kBrowserAssertTest) ||
314 parsed_command_line.HasSwitch(switches::kNoErrorDialogs)) 313 parsed_command_line.HasSwitch(switches::kNoErrorDialogs))
315 return; 314 return;
316 315
317 // The encoding we use for the info is "title|context|direction" where 316 // The encoding we use for the info is "title|context|direction" where
318 // direction is either env_vars::kRtlLocale or env_vars::kLtrLocale depending 317 // direction is either env_vars::kRtlLocale or env_vars::kLtrLocale depending
319 // on the current locale. 318 // on the current locale.
320 base::string16 dlg_strings(l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_TITLE) ); 319 base::string16 dlg_strings(l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_TITLE) );
321 dlg_strings.push_back('|'); 320 dlg_strings.push_back('|');
322 base::string16 adjusted_string( 321 base::string16 adjusted_string(
323 l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_CONTENT)); 322 l10n_util::GetStringUTF16(IDS_CRASH_RECOVERY_CONTENT));
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
476 if (resource_id) 475 if (resource_id)
477 return l10n_util::GetStringUTF16(resource_id); 476 return l10n_util::GetStringUTF16(resource_id);
478 return base::string16(); 477 return base::string16();
479 } 478 }
480 479
481 // static 480 // static
482 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() { 481 void ChromeBrowserMainPartsWin::SetupInstallerUtilStrings() {
483 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ()); 482 CR_DEFINE_STATIC_LOCAL(TranslationDelegate, delegate, ());
484 installer::SetTranslationDelegate(&delegate); 483 installer::SetTranslationDelegate(&delegate);
485 } 484 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main.cc ('k') | content/public/common/content_switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698