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

Unified Diff: apps/shell/browser/default_shell_browser_main_delegate.cc

Issue 313733005: Introduces --app flag to athena to load an app. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix Created 6 years, 6 months 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 | « no previous file | apps/shell/browser/shell_extension_system.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: apps/shell/browser/default_shell_browser_main_delegate.cc
diff --git a/apps/shell/browser/default_shell_browser_main_delegate.cc b/apps/shell/browser/default_shell_browser_main_delegate.cc
index 3efabbb36d7f5a88dba923e70a11f74d618a53c3..b9a8baffe1e33fd2d5680bff211fa5b55b38af24 100644
--- a/apps/shell/browser/default_shell_browser_main_delegate.cc
+++ b/apps/shell/browser/default_shell_browser_main_delegate.cc
@@ -29,7 +29,9 @@ void DefaultShellBrowserMainDelegate::Start(
extensions::ShellExtensionSystem* extension_system =
static_cast<extensions::ShellExtensionSystem*>(
extensions::ExtensionSystem::Get(browser_context));
- extension_system->LoadAndLaunchApp(app_absolute_dir);
+ if (!extension_system->LoadApp(app_absolute_dir))
+ return;
+ extension_system->LaunchApp();
} else {
LOG(ERROR) << "--" << kAppSwitch << " unset; boredom is in your future";
}
« no previous file with comments | « no previous file | apps/shell/browser/shell_extension_system.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698