Add load-app flag support to chrome

chrome/browser/ui/startup/startup_browser_creator.cc

 // Copyright (c) 2012 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 "chrome/browser/ui/startup/startup_browser_creator.h"
 
 #include <algorithm>   // For max().
 #include <set>
 
 #include "apps/app_load_service.h"
 #include "apps/switches.h"
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/lazy_instance.h"
 #include "base/logging.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/metrics/histogram.h"
 #include "base/metrics/statistics_recorder.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
+#include "base/strings/string_tokenizer.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/thread_restrictions.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/auto_launch_trial.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/custom_handlers/protocol_handler_registry.h"
 #include "chrome/browser/extensions/startup_helper.h"
 #include "chrome/browser/extensions/unpacked_installer.h"
 #include "chrome/browser/first_run/first_run.h"
@@ skipping 19 matching lines @@
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/installer/util/browser_distribution.h"
 #include "components/google/core/browser/google_util.h"
 #include "components/search_engines/util.h"
 #include "components/signin/core/common/profile_management_switches.h"
 #include "components/url_fixer/url_fixer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_security_policy.h"
 #include "content/public/browser/navigation_controller.h"
+#include "extensions/common/switches.h"
 #include "net/base/net_util.h"
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #endif
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/app_mode/app_launch_utils.h"
 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
 #include "chrome/browser/chromeos/login/demo_mode/demo_app_launcher.h"
@@ skipping 526 matching lines @@
           FROM_HERE,
           base::Bind(&DumpBrowserHistograms, output_file));
     }
     silent_launch = true;
   }
 
   // If we don't want to launch a new browser window or tab we are done here.
   if (silent_launch)
     return true;
 
-  VLOG(2) << "ProcessCmdLineImpl: PLACE 4";
+  VLOG(2) << "ProcessCmdLineImpl: PLACE 4.A";
+  if (command_line.HasSwitch(extensions::switches::kLoadApps) &&
+      !IncognitoModePrefs::ShouldLaunchIncognito(
+          command_line, last_used_profile->GetPrefs())) {
+    if (!ProcessLoadApps(command_line, cur_dir, last_used_profile))
+      return false;
+
+    // Return early here since we don't want to open a browser window.

[James Hawkins, 2014/11/18 01:24:33]

Optional nit: Consider rewording to remove ambiguous pronoun 'we'.

[Zachary Kuznia, 2014/11/18 23:32:22]

Done.

+    // The exception is when there are no browser windows, since we don't want
+    // chrome to shut down.
+    // TODO(jackhou): Do this properly once keep-alive is handled by the
+    // background page of apps. Tracked at http://crbug.com/175381
+    if (chrome::GetTotalBrowserCountForProfile(last_used_profile) != 0)
+      return true;
+  }
+
+  VLOG(2) << "ProcessCmdLineImpl: PLACE 4.B";
   // Check for --load-and-launch-app.
   if (command_line.HasSwitch(apps::kLoadAndLaunchApp) &&
       !IncognitoModePrefs::ShouldLaunchIncognito(
           command_line, last_used_profile->GetPrefs())) {
     CommandLine::StringType path = command_line.GetSwitchValueNative(
         apps::kLoadAndLaunchApp);
 
     if (!apps::AppLoadService::Get(last_used_profile)->LoadAndLaunch(
             base::FilePath(path), command_line, cur_dir)) {
       return false;
@@ skipping 126 matching lines @@
     VLOG(2) << "ProcessCmdLineImpl: PLACE 8.B";
     // This must be done after all profiles have been launched so the observer
     // knows about all profiles to wait for before activating this one.
     profile_launch_observer.Get().set_profile_to_activate(last_used_profile);
   }
   VLOG(2) << "ProcessCmdLineImpl: END";
   return true;
 }
 
 // static
+bool StartupBrowserCreator::ProcessLoadApps(const CommandLine& command_line,

[James Hawkins, 2014/11/18 01:24:34]

nit: Document method and parameters.

[Zachary Kuznia, 2014/11/18 23:32:21]

Documentation added to header file.

+                                            const base::FilePath& cur_dir,
+                                            Profile* last_used_profile) {
+  CommandLine::StringType path_list =
+      command_line.GetSwitchValueNative(extensions::switches::kLoadApps);
+
+  base::StringTokenizerT<CommandLine::StringType,
+                         CommandLine::StringType::const_iterator>
+      tokenizer(path_list, FILE_PATH_LITERAL(","));
+
+  bool first_app = true;

[James Hawkins, 2014/11/18 01:24:33]

Why not just manually call tokenizer.getNext() outside the while loop and
unconditionally do the code at 794?  Then the while loop can be simplified to
the code at 799.  Unless I'm misreading this.

[Zachary Kuznia, 2014/11/18 23:32:21]

Done.

+  while (tokenizer.GetNext()) {
+    base::FilePath app_absolute_dir =
+        base::MakeAbsoluteFilePath(base::FilePath(tokenizer.token()));
+
+    if (first_app) {
+      first_app = false;
+      if (!apps::AppLoadService::Get(last_used_profile)->LoadAndLaunch(

[James Hawkins, 2014/11/18 01:24:33]

This is somewhat confusing.  We're launching the first app?  I thought this flag
just loads the apps?

[Zachary Kuznia, 2014/11/18 23:32:21]

The first app is loaded so that app_shell and chrome handle this flag the same
way.  On app_shell, we always want to launch an app, so the first app is
launched by convention.

+              app_absolute_dir, command_line, cur_dir)) {
+        return false;
+      }
+    } else {
+      if (!apps::AppLoadService::Get(last_used_profile)->Load(
+              app_absolute_dir)) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+// static
 void StartupBrowserCreator::ProcessCommandLineOnProfileCreated(
     const CommandLine& command_line,
     const base::FilePath& cur_dir,
     Profile* profile,
     Profile::CreateStatus status) {
   if (status == Profile::CREATE_STATUS_INITIALIZED)
     ProcessCmdLineImpl(command_line, cur_dir, false, profile, Profiles(), NULL,
                        NULL);
 }
 
@@ skipping 38 matching lines @@
   // If we are showing the app list then chrome isn't shown so load the app
   // list's profile rather than chrome's.
   if (command_line.HasSwitch(switches::kShowAppList)) {
     return AppListService::Get(chrome::HOST_DESKTOP_TYPE_NATIVE)->
         GetProfilePath(user_data_dir);
   }
 
   return g_browser_process->profile_manager()->GetLastUsedProfileDir(
       user_data_dir);
 }