Minimal athena shell main

apps/shell/browser/shell_browser_main_parts.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "apps/shell/browser/shell_browser_main_parts.h"
 
 #include "apps/shell/browser/shell_browser_context.h"
+#include "apps/shell/browser/shell_browser_main_delegate.h"
 #include "apps/shell/browser/shell_desktop_controller.h"
 #include "apps/shell/browser/shell_extension_system.h"
 #include "apps/shell/browser/shell_extension_system_factory.h"
 #include "apps/shell/browser/shell_extensions_browser_client.h"
 #include "apps/shell/common/shell_extensions_client.h"
-#include "base/command_line.h"
-#include "base/file_util.h"
-#include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "components/keyed_service/content/browser_context_dependency_manager.h"
 #include "content/public/common/result_codes.h"
 #include "content/shell/browser/shell_devtools_delegate.h"
 #include "content/shell/browser/shell_net_log.h"
 #include "extensions/browser/browser_context_keyed_service_factories.h"
 #include "extensions/browser/extension_system.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/base/resource/resource_bundle.h"
 
@@ skipping 14 matching lines @@
 void EnsureBrowserContextKeyedServiceFactoriesBuilt() {
   extensions::EnsureBrowserContextKeyedServiceFactoriesBuilt();
   extensions::ShellExtensionSystemFactory::GetInstance();
 }
 
 }  // namespace
 
 namespace apps {
 
 ShellBrowserMainParts::ShellBrowserMainParts(
-    const content::MainFunctionParams& parameters)
+    const content::MainFunctionParams& parameters,
+    ShellBrowserMainDelegate* browser_main_delegate)
     : extension_system_(NULL),
       parameters_(parameters),
-      run_message_loop_(true) {}
+      run_message_loop_(true),
+      browser_main_delegate_(browser_main_delegate) {
+}
 
 ShellBrowserMainParts::~ShellBrowserMainParts() {
 }
 
 void ShellBrowserMainParts::PreMainMessageLoopStart() {
   // TODO(jamescook): Initialize touch here?
 }
 
 void ShellBrowserMainParts::PostMainMessageLoopStart() {
 #if defined(OS_CHROMEOS)
@@ skipping 34 matching lines @@
   // KeyedServices depend on it.
   // TODO(yoz): Move this after EnsureBrowserContextKeyedServiceFactoriesBuilt.
   CreateExtensionSystem();
 
   ::EnsureBrowserContextKeyedServiceFactoriesBuilt();
   BrowserContextDependencyManager::GetInstance()->CreateBrowserContextServices(
       browser_context_.get());
 
   devtools_delegate_.reset(
       new content::ShellDevToolsDelegate(browser_context_.get()));
-
-  const std::string kAppSwitch = "app";
-  CommandLine* command_line = CommandLine::ForCurrentProcess();
-  if (command_line->HasSwitch(kAppSwitch)) {
-    base::FilePath app_dir(command_line->GetSwitchValueNative(kAppSwitch));
-    base::FilePath app_absolute_dir = base::MakeAbsoluteFilePath(app_dir);
-    extension_system_->LoadAndLaunchApp(app_absolute_dir);
-  } else if (parameters_.ui_task) {
+  if (parameters_.ui_task) {

[James Cook, 2014/05/09 15:56:00]

Just to double-check: Does app_shell_browsertests run OK with this change?

     // For running browser tests.
     parameters_.ui_task->Run();
     delete parameters_.ui_task;
     run_message_loop_ = false;
   } else {
-    LOG(ERROR) << "--" << kAppSwitch << " unset; boredom is in your future";
+    browser_main_delegate_->Start(browser_context_.get());
   }
 }
 
 bool ShellBrowserMainParts::MainMessageLoopRun(int* result_code)  {
   if (!run_message_loop_)
     return true;
   // TODO(yoz): just return false here?
   base::RunLoop run_loop;
   run_loop.Run();
   *result_code = content::RESULT_CODE_NORMAL_EXIT;
@@ skipping 27 matching lines @@
 }
 
 void ShellBrowserMainParts::CreateExtensionSystem() {
   DCHECK(browser_context_);
   extension_system_ = static_cast<ShellExtensionSystem*>(
       ExtensionSystem::Get(browser_context_.get()));
   extension_system_->InitForRegularProfile(true);
 }
 
 }  // namespace apps