Load the calculator app by default

athena/main/athena_main.cc

 // Copyright 2014 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/app/shell_main_delegate.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/renderer/shell_renderer_main_delegate.h"
 #include "athena/content/public/content_activity_factory.h"
 #include "athena/content/public/content_app_model_builder.h"
 #include "athena/home/public/home_card.h"
 #include "athena/main/athena_app_window_controller.h"
 #include "athena/main/athena_launcher.h"
 #include "athena/main/placeholder.h"
 #include "athena/main/url_search_provider.h"
 #include "base/command_line.h"
 #include "base/file_util.h"
 #include "content/public/app/content_main.h"
 #include "ui/aura/window_tree_host.h"
 #include "ui/wm/core/visibility_controller.h"
 
 namespace {
-const std::string kAppSwitch = "app";
+const char kAppSwitch[] = "app";
+
+// We want to load the sample calculator app by default, for a while. Expecting
+// to run athena_main at src/
+const char kDefaultAppPath[] =
+    "chrome/common/extensions/docs/examples/apps/calculator/app";
 }  // namespace
 
 class AthenaBrowserMainDelegate : public apps::ShellBrowserMainDelegate {
  public:
   AthenaBrowserMainDelegate() {}
   virtual ~AthenaBrowserMainDelegate() {}
 
   // apps::ShellBrowserMainDelegate:
   virtual void Start(content::BrowserContext* context) OVERRIDE {
     base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-    if (command_line->HasSwitch(kAppSwitch)) {
-      base::FilePath app_dir(command_line->GetSwitchValueNative(kAppSwitch));
-      base::FilePath app_absolute_dir = base::MakeAbsoluteFilePath(app_dir);
-      extensions::ShellExtensionSystem* extension_system =
-          static_cast<extensions::ShellExtensionSystem*>(
-              extensions::ExtensionSystem::Get(context));
-      extension_system->LoadApp(app_absolute_dir);
-    }
+    base::FilePath app_dir = base::FilePath::FromUTF8Unsafe(
+        command_line->HasSwitch(kAppSwitch) ?
+        command_line->GetSwitchValueNative(kAppSwitch) :
+        kDefaultAppPath);

[oshima, 2014/06/19 23:28:27]

what if the directory does not exist? Just want to make sure it wont fail to
start on the device.

[Jun Mukai, 2014/06/19 23:34:18]

Oops, didn't notice shell_extension_system has a CHECK -- added a check on
athena_main side so that it attempts to load the extension only when it exists.
In other cases (like the directory exists but no app info there), it just fails
to load. Errors messages are printed but it still works.

+
+    base::FilePath app_absolute_dir = base::MakeAbsoluteFilePath(app_dir);
+    extensions::ShellExtensionSystem* extension_system =
+        static_cast<extensions::ShellExtensionSystem*>(
+            extensions::ExtensionSystem::Get(context));
+    extension_system->LoadApp(app_absolute_dir);
 
     athena::StartAthena(
         apps::ShellDesktopController::instance()->host()->window(),
         new athena::ContentActivityFactory(),
         new athena::ContentAppModelBuilder(context));
     athena::HomeCard::Get()->RegisterSearchProvider(
         new athena::UrlSearchProvider(context));
     CreateTestPages(context);
   }
 
@@ skipping 48 matching lines @@
 
 int main(int argc, const char** argv) {
   AthenaMainDelegate delegate;
   content::ContentMainParams params(&delegate);
 
   params.argc = argc;
   params.argv = argv;
 
   return content::ContentMain(params);
 }