diff options
| author | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-28 20:37:58 +0000 |
|---|---|---|
| committer | derat@chromium.org <derat@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-28 20:37:58 +0000 |
| commit | 9e41fef7be7762e0985fbf04506cdb02f86b3833 (patch) | |
| tree | e2e8aed876112e18623ceea7c73d685a21c679a6 /athena | |
| parent | ba85a60e1e866da7d4c8fcc2be26f2470ae0906b (diff) | |
| download | chromium_src-9e41fef7be7762e0985fbf04506cdb02f86b3833.zip chromium_src-9e41fef7be7762e0985fbf04506cdb02f86b3833.tar.gz chromium_src-9e41fef7be7762e0985fbf04506cdb02f86b3833.tar.bz2 | |
app_shell: Support specifying a preferred network.
Add an --app-shell-preferred-network flag, along with
renaming --app to --app-shell-app-path.
BUG=364297
TBR=oshima@chromium.org
Review URL: https://codereview.chromium.org/349533003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280526 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'athena')
| -rw-r--r-- | athena/main/athena_main.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/athena/main/athena_main.cc b/athena/main/athena_main.cc index 906cf3d..7f68442 100644 --- a/athena/main/athena_main.cc +++ b/athena/main/athena_main.cc @@ -43,8 +43,8 @@ class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate { virtual void Start(content::BrowserContext* context) OVERRIDE { base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); base::FilePath app_dir = base::FilePath::FromUTF8Unsafe( - command_line->HasSwitch(apps::switches::kApp) ? - command_line->GetSwitchValueNative(apps::switches::kApp) : + command_line->HasSwitch(apps::switches::kAppShellAppPath) ? + command_line->GetSwitchValueNative(apps::switches::kAppShellAppPath) : kDefaultAppPath); base::FilePath app_absolute_dir = base::MakeAbsoluteFilePath(app_dir); |