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

Unified Diff: athena/main/athena_main_delegate.cc

Issue 727963004: app_shell: Change flag for loading apps to --load-app and only launch (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix athena build Created 6 years, 1 month 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « athena/main/DEPS ('k') | extensions/common/switches.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: athena/main/athena_main_delegate.cc
diff --git a/athena/main/athena_main_delegate.cc b/athena/main/athena_main_delegate.cc
index 59c6c42dbda39d2ffc2866dee427a1aa811ac39d..92836280bbc5c071bbd83f8b47b2b7b09af42105 100644
--- a/athena/main/athena_main_delegate.cc
+++ b/athena/main/athena_main_delegate.cc
@@ -15,6 +15,7 @@
#include "components/pdf/renderer/ppb_pdf_impl.h"
#include "content/public/app/content_main.h"
#include "content/public/browser/browser_thread.h"
+#include "extensions/common/switches.h"
#include "extensions/shell/browser/desktop_controller.h"
#include "extensions/shell/browser/shell_browser_main_delegate.h"
#include "extensions/shell/browser/shell_content_browser_client.h"
@@ -75,9 +76,9 @@ class AthenaBrowserMainDelegate : public extensions::ShellBrowserMainDelegate {
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
base::FilePath app_dir = base::FilePath::FromUTF8Unsafe(
- command_line->HasSwitch(extensions::switches::kAppShellAppPath)
+ command_line->HasSwitch(extensions::switches::kLoadApps)
? command_line->GetSwitchValueNative(
- extensions::switches::kAppShellAppPath)
+ extensions::switches::kLoadApps)
: kDefaultAppPath);
base::FilePath app_absolute_dir = base::MakeAbsoluteFilePath(app_dir);
« no previous file with comments | « athena/main/DEPS ('k') | extensions/common/switches.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698