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

Side by Side Diff: chrome/app/chrome_main_delegate.cc

Issue 196413016: Move CommandLine to base namespace. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/chrome_main_delegate.h ('k') | chrome/browser/about_flags.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/app/chrome_main_delegate.h" 5 #include "chrome/app/chrome_main_delegate.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/files/file_path.h" 8 #include "base/files/file_path.h"
9 #include "base/i18n/rtl.h" 9 #include "base/i18n/rtl.h"
10 #include "base/lazy_instance.h" 10 #include "base/lazy_instance.h"
(...skipping 505 matching lines...) Expand 10 before | Expand all | Expand 10 after
516 diagnostics::DiagnosticsController::GetInstance()->RecordRegularStartup(); 516 diagnostics::DiagnosticsController::GetInstance()->RecordRegularStartup();
517 } 517 }
518 #endif 518 #endif
519 519
520 content::SetContentClient(&chrome_content_client_); 520 content::SetContentClient(&chrome_content_client_);
521 521
522 return false; 522 return false;
523 } 523 }
524 524
525 #if defined(OS_MACOSX) 525 #if defined(OS_MACOSX)
526 void ChromeMainDelegate::InitMacCrashReporter(const CommandLine& command_line, 526 void ChromeMainDelegate::InitMacCrashReporter(
527 const std::string& process_type) { 527 const base::CommandLine& command_line,
528 const std::string& process_type) {
528 // TODO(mark): Right now, InitCrashReporter() needs to be called after 529 // TODO(mark): Right now, InitCrashReporter() needs to be called after
529 // CommandLine::Init() and chrome::RegisterPathProvider(). Ideally, 530 // CommandLine::Init() and chrome::RegisterPathProvider(). Ideally,
530 // Breakpad initialization could occur sooner, preferably even before the 531 // Breakpad initialization could occur sooner, preferably even before the
531 // framework dylib is even loaded, to catch potential early crashes. 532 // framework dylib is even loaded, to catch potential early crashes.
532 breakpad::InitCrashReporter(process_type); 533 breakpad::InitCrashReporter(process_type);
533 534
534 #if defined(NDEBUG) 535 #if defined(NDEBUG)
535 bool is_debug_build = false; 536 bool is_debug_build = false;
536 #else 537 #else
537 bool is_debug_build = true; 538 bool is_debug_build = true;
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
885 } 886 }
886 887
887 content::ContentUtilityClient* 888 content::ContentUtilityClient*
888 ChromeMainDelegate::CreateContentUtilityClient() { 889 ChromeMainDelegate::CreateContentUtilityClient() {
889 #if defined(CHROME_MULTIPLE_DLL_BROWSER) 890 #if defined(CHROME_MULTIPLE_DLL_BROWSER)
890 return NULL; 891 return NULL;
891 #else 892 #else
892 return g_chrome_content_utility_client.Pointer(); 893 return g_chrome_content_utility_client.Pointer();
893 #endif 894 #endif
894 } 895 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main_delegate.h ('k') | chrome/browser/about_flags.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698