summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorrockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-18 00:31:08 +0000
committerrockot@chromium.org <rockot@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-03-18 00:31:08 +0000
commit54a1328047ec5d7f83ddafe34d74d1d9bb344117 (patch)
treebeb8e72bcf20ec9bd6908dbd8592571249d2df29 /apps
parent65e68f4d79b1220bcf23b0f305fa2e9dd1693fab (diff)
downloadchromium_src-54a1328047ec5d7f83ddafe34d74d1d9bb344117.zip
chromium_src-54a1328047ec5d7f83ddafe34d74d1d9bb344117.tar.gz
chromium_src-54a1328047ec5d7f83ddafe34d74d1d9bb344117.tar.bz2
app_shell: CommandLine -> base::CommandLine
CommandLine moved into the base namespace today, breaking app_shell. Quick fix for that. BUG=None TBR=jamescook@chromium.org Review URL: https://codereview.chromium.org/202853002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@257553 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'apps')
-rw-r--r--apps/shell/browser/shell_extensions_browser_client.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/shell/browser/shell_extensions_browser_client.cc b/apps/shell/browser/shell_extensions_browser_client.cc
index a850084..9c940c2 100644
--- a/apps/shell/browser/shell_extensions_browser_client.cc
+++ b/apps/shell/browser/shell_extensions_browser_client.cc
@@ -54,7 +54,7 @@ bool ShellExtensionsBrowserClient::IsShuttingDown() {
}
bool ShellExtensionsBrowserClient::AreExtensionsDisabled(
- const CommandLine& command_line,
+ const base::CommandLine& command_line,
BrowserContext* context) {
return false;
}