summaryrefslogtreecommitdiffstats
path: root/chrome/app
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-17 23:07:15 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-17 23:07:15 +0000
commit2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c (patch)
tree78766377b2779fe9b9afbc869a97f387b9b3d082 /chrome/app
parent936e85963a6d11c79c7ea774bc41c8729c04693f (diff)
downloadchromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.zip
chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.tar.gz
chromium_src-2f3b1cce4c8d4d6a4b016f4d03fca5ee88348a2c.tar.bz2
Move CommandLine to base namespace.
Fix all forward-declares and header files referencing CommandLine. This keeps a "using base::CommandLine" in the command line header file so that the rest of the source files can be changes in a follow-up. TBR=sky Review URL: https://codereview.chromium.org/196413016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257514 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/app')
-rw-r--r--chrome/app/chrome_main_delegate.cc5
-rw-r--r--chrome/app/chrome_main_delegate.h6
2 files changed, 8 insertions, 3 deletions
diff --git a/chrome/app/chrome_main_delegate.cc b/chrome/app/chrome_main_delegate.cc
index be19f7b..c5f62a8 100644
--- a/chrome/app/chrome_main_delegate.cc
+++ b/chrome/app/chrome_main_delegate.cc
@@ -537,8 +537,9 @@ bool ChromeMainDelegate::BasicStartupComplete(int* exit_code) {
}
#if defined(OS_MACOSX)
-void ChromeMainDelegate::InitMacCrashReporter(const CommandLine& command_line,
- const std::string& process_type) {
+void ChromeMainDelegate::InitMacCrashReporter(
+ const base::CommandLine& command_line,
+ const std::string& process_type) {
// TODO(mark): Right now, InitCrashReporter() needs to be called after
// CommandLine::Init() and chrome::RegisterPathProvider(). Ideally,
// Breakpad initialization could occur sooner, preferably even before the
diff --git a/chrome/app/chrome_main_delegate.h b/chrome/app/chrome_main_delegate.h
index f4a105b..5b651fe 100644
--- a/chrome/app/chrome_main_delegate.h
+++ b/chrome/app/chrome_main_delegate.h
@@ -10,6 +10,10 @@
#include "chrome/common/chrome_content_client.h"
#include "content/public/app/content_main_delegate.h"
+namespace base {
+class CommandLine;
+}
+
// Chrome implementation of ContentMainDelegate.
class ChromeMainDelegate : public content::ContentMainDelegate {
public:
@@ -42,7 +46,7 @@ class ChromeMainDelegate : public content::ContentMainDelegate {
virtual content::ContentUtilityClient* CreateContentUtilityClient() OVERRIDE;
#if defined(OS_MACOSX)
- void InitMacCrashReporter(const CommandLine& command_line,
+ void InitMacCrashReporter(const base::CommandLine& command_line,
const std::string& process_type);
#endif // defined(OS_MACOSX)