Sync the launch type pref for apps.

chrome/browser/extensions/launch_util.cc

 // Copyright (c) 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 "chrome/browser/extensions/launch_util.h"
 
 #include "base/command_line.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_prefs.h"
+#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/ui/host_desktop.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/manifest_handlers/app_launch_info.h"
 #include "extensions/common/extension.h"
 
 #if defined(OS_WIN)
 #include "win8/util/win8_util.h"
 #endif
 
 #if defined(USE_ASH)
 #include "ash/shell.h"
 #endif
 
 namespace extensions {
 namespace {
 
 // A preference set by the the NTP to persist the desired launch container type
 // used for apps.
 const char kPrefLaunchType[] = "launchType";
 
 }  // namespace
 
 LaunchType GetLaunchType(const ExtensionPrefs* prefs,
                          const Extension* extension) {
-  int value = -1;
   LaunchType result = LAUNCH_TYPE_DEFAULT;
 
   // Launch hosted apps as windows by default for streamlined hosted apps.
   if (CommandLine::ForCurrentProcess()->
           HasSwitch(switches::kEnableStreamlinedHostedApps) &&
       extension->id() != extension_misc::kChromeAppId) {
     result = LAUNCH_TYPE_WINDOW;
   }
 
-  if (prefs->ReadPrefAsInteger(extension->id(), kPrefLaunchType, &value) &&
-      (value == LAUNCH_TYPE_PINNED ||
-       value == LAUNCH_TYPE_REGULAR ||
-       value == LAUNCH_TYPE_FULLSCREEN ||
-       value == LAUNCH_TYPE_WINDOW)) {
+  int value = GetLaunchTypePrefValue(prefs, extension->id());
+  if (value >= LAUNCH_TYPE_FIRST && value < NUM_LAUNCH_TYPES)
     result = static_cast<LaunchType>(value);
-  }
+
 #if defined(OS_MACOSX)
     // App windows are not yet supported on mac.  Pref sync could make
     // the launch type LAUNCH_TYPE_WINDOW, even if there is no UI to set it
     // on mac.
     if (!extension->is_platform_app() && result == LAUNCH_TYPE_WINDOW)
       result = LAUNCH_TYPE_REGULAR;
 #endif
 
 #if defined(OS_WIN)
     // We don't support app windows in Windows 8 single window Metro mode.
     if (win8::IsSingleWindowMetroMode() && result == LAUNCH_TYPE_WINDOW)
       result = LAUNCH_TYPE_REGULAR;
 #endif  // OS_WIN
 
   return result;
 }
 
-void SetLaunchType(ExtensionPrefs* prefs,
+LaunchType GetLaunchTypePrefValue(const ExtensionPrefs* prefs,
+                                  const std::string& extension_id) {
+  int value = LAUNCH_TYPE_INVALID;
+  return prefs->ReadPrefAsInteger(extension_id, kPrefLaunchType, &value)
+      ? static_cast<LaunchType>(value) : LAUNCH_TYPE_INVALID;
+}
+
+void SetLaunchType(ExtensionService* service,
                    const std::string& extension_id,
                    LaunchType launch_type) {
-  prefs->UpdateExtensionPref(extension_id, kPrefLaunchType,
+  DCHECK(launch_type >= LAUNCH_TYPE_FIRST && launch_type < NUM_LAUNCH_TYPES);
+
+  service->extension_prefs()->UpdateExtensionPref(extension_id, kPrefLaunchType,
       new base::FundamentalValue(static_cast<int>(launch_type)));
+
+  // Sync the launch type.
+  const Extension* extension = service->GetInstalledExtension(extension_id);
+  if (extension) {
+    ExtensionSyncService::Get(service->profile())->
+        SyncExtensionChangeIfNeeded(*extension);
+  }
 }
 
 LaunchContainer GetLaunchContainer(const ExtensionPrefs* prefs,
                                    const Extension* extension) {
   LaunchContainer manifest_launch_container =
       AppLaunchInfo::GetLaunchContainer(extension);
 
   const LaunchContainer kInvalidLaunchContainer =
       static_cast<LaunchContainer>(-1);
 
@@ skipping 45 matching lines @@
 bool HasPreferredLaunchContainer(const ExtensionPrefs* prefs,
                                  const Extension* extension) {
   int value = -1;
   LaunchContainer manifest_launch_container =
       AppLaunchInfo::GetLaunchContainer(extension);
   return manifest_launch_container == LAUNCH_CONTAINER_TAB &&
       prefs->ReadPrefAsInteger(extension->id(), kPrefLaunchType, &value);
 }
 
 }  // namespace extensions