Revert 263741 "Enable surprise me wallpaper for new profiles."

> Enable surprise me wallpaper for new profiles.
>
> BUG=305855, 322603
> TBR=awatson@chromium.org
>
> Review URL: https://codereview.chromium.org/162393002

TBR=harrym@chromium.org

Review URL: https://codereview.chromium.org/274163003

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269463 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/chromeos/login/login_utils.cc

@@ -51,7 +51,6 @@
 #include "chrome/browser/chromeos/login/supervised_user_manager.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
-#include "chrome/browser/chromeos/login/wallpaper_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/first_run/first_run.h"
@@ -349,14 +348,6 @@ void LoginUtilsImpl::DoBrowserLaunchOnLocaleLoadedImpl(
                                 first_run,
                                 &return_code);
 
-  // If the current user is a new regular user (not including
-  // multi-profile cases) enable surprise me wallpaper by default.
-  if (UserManager::Get()->IsCurrentUserNew() &&
-      UserManager::Get()->IsLoggedInAsRegularUser() &&
-      UserManager::Get()->GetLoggedInUsers().size() == 1) {
-    WallpaperManager::Get()->EnableSurpriseMe();
-  }
-
   // Triggers app launcher start page service to load start page web contents.
   app_list::StartPageService::Get(profile);
 

chrome/browser/chromeos/login/wallpaper_manager.cc

@@ -30,16 +30,12 @@
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/customization_document.h"
-#include "chrome/browser/chromeos/extensions/wallpaper_manager_util.h"
-#include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
-#include "chrome/browser/chromeos/login/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/user.h"
 #include "chrome/browser/chromeos/login/user_image.h"
 #include "chrome/browser/chromeos/login/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
-#include "chrome/browser/extensions/extension_service.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/pref_names.h"
@@ -47,8 +43,6 @@
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/notification_service.h"
-#include "content/public/browser/web_ui.h"
-#include "extensions/browser/event_router.h"
 #include "grit/ash_resources.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/codec/jpeg_codec.h"
@@ -1165,20 +1159,6 @@ void WallpaperManager::RemoveObserver(WallpaperManager::Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
-void WallpaperManager::EnableSurpriseMe() {
-  Profile* profile = ProfileManager::GetActiveUserProfile();
-  DCHECK(profile);
-  DCHECK(extensions::EventRouter::Get(profile));
-
-  using namespace extensions::api::wallpaper_private;
-  scoped_ptr<extensions::Event> event(
-      new extensions::Event(OnRequestEnableSurpriseMe::kEventName,
-                            OnRequestEnableSurpriseMe::Create()));
-
-  extensions::EventRouter::Get(profile)->DispatchEventToExtension(
-      extension_misc::kWallpaperManagerId, event.Pass());
-}
-
 void WallpaperManager::NotifyAnimationFinished() {
   FOR_EACH_OBSERVER(
       Observer, observers_, OnWallpaperAnimationFinished(last_selected_user_));

chrome/browser/chromeos/login/wallpaper_manager.h

@@ -333,9 +333,6 @@ class WallpaperManager: public content::NotificationObserver {
                        const std::string& user_id,
                        scoped_ptr<std::string> data);
 
-  // Enable surprise me wallpaper mode.
-  void EnableSurpriseMe();
-
   // This is called from CustomizationDocument.
   // |resized_directory| is the directory where resized versions are stored and
   // must be writable.

chrome/browser/resources/chromeos/wallpaper_manager/js/event_page.js

@@ -4,7 +4,6 @@
 
 var WALLPAPER_PICKER_WIDTH = 574;
 var WALLPAPER_PICKER_HEIGHT = 420;
-var SURPRISE_ME_ALARM_NAME = 'DefaultEnableSurpriseMe';
 
 var wallpaperPickerWindow;
 
@@ -272,23 +271,6 @@ chrome.storage.onChanged.addListener(function(changes, namespace) {
   }
 });
 
-chrome.alarms.onAlarm.addListener(function(alarm) {
-  if (alarm.name === SURPRISE_ME_ALARM_NAME) {
-    Constants.WallpaperSyncStorage.get(Constants.AccessSurpriseMeEnabledKey,
-                                        function(items) {
-      if (!items.hasOwnProperty(Constants.AccessSurpriseMeEnabledKey)) {
-        WallpaperUtil.saveToStorage(Constants.AccessSurpriseMeEnabledKey,
-                                    true, true);
-      }
-    });
-  } else {
-    SurpriseWallpaper.getInstance().next();
-  }
-});
-
-/**
- * Enables surprise me wallpaper iff it has not already been configured.
- */
-chrome.wallpaperPrivate.onRequestEnableSurpriseMe.addListener(function() {
-  chrome.alarms.create(SURPRISE_ME_ALARM_NAME, {delayInMinutes: 5});
+chrome.alarms.onAlarm.addListener(function() {
+  SurpriseWallpaper.getInstance().next();
 });

chrome/common/extensions/api/wallpaper_private.json

@@ -238,14 +238,6 @@
           }
         ]
       }
-    ],
-    "events": [
-      {
-        "name": "onRequestEnableSurpriseMe",
-        "type": "function",
-        "description": "Fired to request enabling surprise me mode for new profiles.",
-        "parameters": []
-      }
     ]
   }
 ]