diff options
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/app_load_service.h | 4 | ||||
| -rw-r--r-- | apps/launcher.h | 4 | ||||
| -rw-r--r-- | apps/shell/browser/shell_content_browser_client.h | 2 | ||||
| -rw-r--r-- | apps/shell/browser/shell_extensions_browser_client.h | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/apps/app_load_service.h b/apps/app_load_service.h index ec71a7e..2ccd3e0 100644 --- a/apps/app_load_service.h +++ b/apps/app_load_service.h @@ -37,7 +37,7 @@ class AppLoadService : public KeyedService, PostReloadAction(); PostReloadActionType action_type; - CommandLine command_line; + base::CommandLine command_line; base::FilePath current_dir; }; @@ -53,7 +53,7 @@ class AppLoadService : public KeyedService, // launch parameters. Returns true if loading the extension has begun // successfully. bool LoadAndLaunch(const base::FilePath& extension_path, - const CommandLine& command_line, + const base::CommandLine& command_line, const base::FilePath& current_dir); static AppLoadService* Get(Profile* profile); diff --git a/apps/launcher.h b/apps/launcher.h index 579da0f..d41f517 100644 --- a/apps/launcher.h +++ b/apps/launcher.h @@ -7,11 +7,11 @@ #include <string> -class CommandLine; class GURL; class Profile; namespace base { +class CommandLine; class FilePath; } @@ -27,7 +27,7 @@ namespace apps { // |current_directory| is used to expand any relative paths on the command line. void LaunchPlatformAppWithCommandLine(Profile* profile, const extensions::Extension* extension, - const CommandLine& command_line, + const base::CommandLine& command_line, const base::FilePath& current_directory); // Launches the platform app |extension| by issuing an onLaunched event diff --git a/apps/shell/browser/shell_content_browser_client.h b/apps/shell/browser/shell_content_browser_client.h index 7de6844..de9331d 100644 --- a/apps/shell/browser/shell_content_browser_client.h +++ b/apps/shell/browser/shell_content_browser_client.h @@ -41,7 +41,7 @@ class ShellContentBrowserClient : public content::ContentBrowserClient { OVERRIDE; virtual void SiteInstanceDeleting(content::SiteInstance* site_instance) OVERRIDE; - virtual void AppendExtraCommandLineSwitches(CommandLine* command_line, + virtual void AppendExtraCommandLineSwitches(base::CommandLine* command_line, int child_process_id) OVERRIDE; virtual void GetAdditionalAllowedSchemesForFileSystem( std::vector<std::string>* additional_schemes) OVERRIDE; diff --git a/apps/shell/browser/shell_extensions_browser_client.h b/apps/shell/browser/shell_extensions_browser_client.h index 4524ec3..d491adf 100644 --- a/apps/shell/browser/shell_extensions_browser_client.h +++ b/apps/shell/browser/shell_extensions_browser_client.h @@ -24,7 +24,7 @@ class ShellExtensionsBrowserClient : public ExtensionsBrowserClient { // ExtensionsBrowserClient overrides: virtual bool IsShuttingDown() OVERRIDE; - virtual bool AreExtensionsDisabled(const CommandLine& command_line, + virtual bool AreExtensionsDisabled(const base::CommandLine& command_line, content::BrowserContext* context) OVERRIDE; virtual bool IsValidContext(content::BrowserContext* context) OVERRIDE; virtual bool IsSameContext(content::BrowserContext* first, |