ntp4: make default

chrome/browser/ui/webui/ntp/app_launcher_handler.cc

 // Copyright (c) 2011 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/webui/ntp/app_launcher_handler.h"
 
 #include <string>
 #include <vector>
 
 #include "base/auto_reset.h"
 #include "base/callback.h"
-#include "base/command_line.h"
 #include "base/metrics/histogram.h"
 #include "base/string_number_conversions.h"
 #include "base/string_split.h"
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/extensions/apps_promo.h"
 #include "chrome/browser/extensions/crx_installer.h"
 #include "chrome/browser/extensions/extension_prefs.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/prefs/scoped_user_pref_update.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/browser_window.h"
 #include "chrome/browser/ui/webui/extension_icon_source.h"
+#include "chrome/browser/ui/webui/ntp/new_tab_ui.h"
 #include "chrome/browser/ui/webui/ntp/shown_sections_handler.h"
 #include "chrome/common/chrome_notification_types.h"
-#include "chrome/common/chrome_switches.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "chrome/common/extensions/extension_icon_set.h"
 #include "chrome/common/extensions/extension_resource.h"
 #include "chrome/common/favicon_url.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/common/web_apps.h"
 #include "content/browser/disposition_utils.h"
 #include "content/browser/tab_contents/tab_contents.h"
@@ skipping 50 matching lines @@
   }
   return dictionary;
 }
 
 // static
 bool AppLauncherHandler::IsAppExcludedFromList(const Extension* extension) {
   // Don't include the WebStore and the Cloud Print app.
   // The WebStore launcher gets special treatment in ntp/apps.js.
   // The Cloud Print app should never be displayed in the NTP.
   bool ntp3 =
-      !CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4);
+      !NewTabUI::Ntp4Enabled();
   if (!extension->is_app() ||
       (ntp3 && extension->id() == extension_misc::kWebStoreAppId) ||
       (extension->id() == extension_misc::kCloudPrintAppId)) {
     return true;
   }
   return false;
 }
 
 void AppLauncherHandler::CreateAppInfo(const Extension* extension,
                                        const AppNotification* notification,
@@ skipping 145 matching lines @@
     }
     case chrome::NOTIFICATION_EXTENSION_LOADED:
     case chrome::NOTIFICATION_EXTENSION_UNLOADED: {
       const Extension* extension =
           type == chrome::NOTIFICATION_EXTENSION_LOADED ?
               Details<const Extension>(details).ptr() :
               Details<UnloadedExtensionInfo>(details)->extension;
       if (!extension->is_app())
         break;
 
-      if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4)) {
+      if (NewTabUI::Ntp4Enabled()) {
         scoped_ptr<DictionaryValue> app_info(GetAppInfo(extension));
         if (app_info.get()) {
           std::string function =
               type == chrome::NOTIFICATION_EXTENSION_LOADED ?
                   "ntp4.appAdded" : "ntp4.appRemoved";
           web_ui_->CallJavascriptFunction(function, *app_info);
         }
       } else if (web_ui_->tab_contents()) {
         HandleGetApps(NULL);
       }
@@ skipping 77 matching lines @@
   // Making shortcut does not make sense on ChromeOS because it does not have
   // a desktop.
   dictionary->SetBoolean("disableCreateAppShortcut", true);
 #endif
 
   dictionary->SetBoolean(
       "showLauncher",
       extension_service_->apps_promo()->ShouldShowAppLauncher(
           extension_service_->GetAppIds()));
 
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4)) {
+  if (NewTabUI::Ntp4Enabled()) {
     PrefService* prefs = web_ui_->GetProfile()->GetPrefs();
     const ListValue* app_page_names = prefs->GetList(prefs::kNTPAppPageNames);
     if (app_page_names && app_page_names->GetSize()) {
       dictionary->Set("appPageNames",
                       static_cast<ListValue*>(app_page_names->DeepCopy()));
     }
   }
 }
 
 DictionaryValue* AppLauncherHandler::GetAppInfo(const Extension* extension) {
@@ skipping 113 matching lines @@
   // If the user pressed special keys when clicking, override the saved
   // preference for launch container.
   bool middle_button = (button == 1.0);
   WindowOpenDisposition disposition =
         disposition_utils::DispositionFromClick(middle_button, alt_key,
                                                 ctrl_key, meta_key, shift_key);
 
   if (extension_id != extension_misc::kWebStoreAppId) {
     RecordAppLaunchByID(promo_active_, launch_bucket);
     extension_service_->apps_promo()->ExpireDefaultApps();
-  } else if (CommandLine::ForCurrentProcess()->HasSwitch(
-        switches::kNewTabPage4)) {
+  } else if (NewTabUI::Ntp4Enabled()) {
     RecordWebStoreLaunch(promo_active_);
   }
 
   if (disposition == NEW_FOREGROUND_TAB || disposition == NEW_BACKGROUND_TAB) {
     // TODO(jamescook): Proper support for background tabs.
     Browser::OpenApplication(
         profile, extension, extension_misc::LAUNCH_TAB, disposition);
   } else if (disposition == NEW_WINDOW) {
     // Force a new window open.
     Browser::OpenApplication(
@@ skipping 27 matching lines @@
   double launch_type;
   CHECK(args->GetString(0, &extension_id));
   CHECK(args->GetDouble(1, &launch_type));
 
   const Extension* extension =
       extension_service_->GetExtensionById(extension_id, true);
   CHECK(extension);
 
   // Don't update the page; it already knows about the launch type change.
   scoped_ptr<AutoReset<bool> > auto_reset;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4))
+  if (NewTabUI::Ntp4Enabled())
     auto_reset.reset(new AutoReset<bool>(&ignore_changes_, true));
 
   extension_service_->extension_prefs()->SetLaunchType(
       extension_id,
       static_cast<ExtensionPrefs::LaunchType>(
           static_cast<int>(launch_type)));
 }
 
 void AppLauncherHandler::HandleUninstallApp(const ListValue* args) {
   std::string extension_id;
@@ skipping 10 matching lines @@
     return;
   }
   if (!extension_id_prompting_.empty())
     return;  // Only one prompt at a time.
 
   extension_id_prompting_ = extension_id;
 
   bool dont_confirm = false;
   if (args->GetBoolean(1, &dont_confirm) && dont_confirm) {
     scoped_ptr<AutoReset<bool> > auto_reset;
-    if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4))
+    if (NewTabUI::Ntp4Enabled())
       auto_reset.reset(new AutoReset<bool>(&ignore_changes_, true));
     ExtensionDialogAccepted();
   } else {
     GetExtensionUninstallDialog()->ConfirmUninstall(this, extension);
   }
 }
 
 void AppLauncherHandler::HandleHideAppsPromo(const ListValue* args) {
   // If the user has intentionally hidden the promotion, we'll uninstall all the
   // default apps (we know the user hasn't installed any apps on their own at
   // this point, or the promotion wouldn't have been shown).
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4)) {
+  if (NewTabUI::Ntp4Enabled()) {
     UninstallDefaultApps();
     extension_service_->apps_promo()->HidePromo();
   } else {
     // TODO(estade): remove all this. NTP3 uninstalled all the default apps then
     // refreshed the entire NTP, we don't have to jump through these hoops for
     // NTP4 because each app uninstall is handled separately without reloading
     // the entire page.
     ignore_changes_ = true;
     UninstallDefaultApps();
     extension_service_->apps_promo()->HidePromo();
@@ skipping 30 matching lines @@
 
   std::vector<std::string> extension_ids;
   for (size_t i = 0; i < app_order->GetSize(); ++i) {
     std::string value;
     if (app_order->GetString(i, &value))
       extension_ids.push_back(value);
   }
 
   // Don't update the page; it already knows the apps have been reordered.
   scoped_ptr<AutoReset<bool> > auto_reset;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4))
+  if (NewTabUI::Ntp4Enabled())
     auto_reset.reset(new AutoReset<bool>(&ignore_changes_, true));
 
   extension_service_->extension_prefs()->SetAppDraggedByUser(dragged_app_id);
   extension_service_->extension_prefs()->SetAppLauncherOrder(extension_ids);
 }
 
 void AppLauncherHandler::HandleSetPageIndex(const ListValue* args) {
   std::string extension_id;
   double page_index;
   CHECK(args->GetString(0, &extension_id));
   CHECK(args->GetDouble(1, &page_index));
 
   // Don't update the page; it already knows the apps have been reordered.
   scoped_ptr<AutoReset<bool> > auto_reset;
-  if (CommandLine::ForCurrentProcess()->HasSwitch(switches::kNewTabPage4))
+  if (NewTabUI::Ntp4Enabled())
     auto_reset.reset(new AutoReset<bool>(&ignore_changes_, true));
 
   extension_service_->extension_prefs()->SetPageIndex(extension_id,
       static_cast<int>(page_index));
 }
 
 void AppLauncherHandler::HandlePromoSeen(const ListValue* args) {
   UMA_HISTOGRAM_ENUMERATION(extension_misc::kAppsPromoHistogram,
                             extension_misc::PROMO_SEEN,
                             extension_misc::PROMO_BUCKET_BOUNDARY);
@@ skipping 239 matching lines @@
 
 void AppLauncherHandler::UninstallDefaultApps() {
   AppsPromo* apps_promo = extension_service_->apps_promo();
   const ExtensionIdSet& app_ids = apps_promo->old_default_apps();
   for (ExtensionIdSet::const_iterator iter = app_ids.begin();
        iter != app_ids.end(); ++iter) {
     if (extension_service_->GetExtensionById(*iter, true))
       extension_service_->UninstallExtension(*iter, false, NULL);
   }
 }