Revert 136573 - Extract StartupTabs and startup types from StartupBrowserCreator.

chrome/browser/protector/session_startup_change.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 "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/logging.h"
 #include "base/metrics/histogram.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/session_startup_pref.h"
 #include "chrome/browser/protector/base_prefs_change.h"
 #include "chrome/browser/protector/histograms.h"
 #include "chrome/browser/protector/protector_service.h"
 #include "chrome/browser/protector/protector_service_factory.h"
-#include "chrome/browser/tabs/pinned_tab_codec.h"
 #include "chrome/browser/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_navigator.h"
 #include "chrome/common/pref_names.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
 #include "grit/theme_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace protector {
 
 // Session startup settings change tracked by Protector.
 class SessionStartupChange : public BasePrefsChange {
  public:
   SessionStartupChange(const SessionStartupPref& actual_startup_pref,
-                       const StartupTabs& actual_pinned_tabs,
+                       const PinnedTabCodec::Tabs& actual_pinned_tabs,
                        const SessionStartupPref& backup_startup_pref,
-                       const StartupTabs& backup_pinned_tabs);
+                       const PinnedTabCodec::Tabs& backup_pinned_tabs);
 
   // BaseSettingChange overrides:
   virtual bool Init(Profile* profile) OVERRIDE;
   virtual void Apply(Browser* browser) OVERRIDE;
   virtual void Discard(Browser* browser) OVERRIDE;
   virtual void Timeout() OVERRIDE;
   virtual int GetBadgeIconID() const OVERRIDE;
   virtual int GetMenuItemIconID() const OVERRIDE;
   virtual int GetBubbleIconID() const OVERRIDE;
   virtual string16 GetBubbleTitle() const OVERRIDE;
   virtual string16 GetBubbleMessage() const OVERRIDE;
   virtual string16 GetApplyButtonText() const OVERRIDE;
   virtual string16 GetDiscardButtonText() const OVERRIDE;
   virtual DisplayName GetApplyDisplayName() const OVERRIDE;
   virtual GURL GetNewSettingURL() const OVERRIDE;
 
  private:
   virtual ~SessionStartupChange();
 
   // Returns the first URL that was added to the startup pages. Returns the
   // first startup URL if they haven't changed. Returns an empty URL if there
   // are no startup URLs.
   GURL GetFirstNewURL() const;
 
   // Opens all tabs in |tabs| and makes them pinned.
-  void OpenPinnedTabs(Browser* browser, const StartupTabs& tabs);
+  void OpenPinnedTabs(Browser* browser, const PinnedTabCodec::Tabs& tabs);
 
   const SessionStartupPref new_startup_pref_;
   const SessionStartupPref backup_startup_pref_;
-  const StartupTabs new_pinned_tabs_;
-  const StartupTabs backup_pinned_tabs_;
+  const PinnedTabCodec::Tabs new_pinned_tabs_;
+  const PinnedTabCodec::Tabs backup_pinned_tabs_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStartupChange);
 };
 
 SessionStartupChange::SessionStartupChange(
     const SessionStartupPref& actual_startup_pref,
-    const StartupTabs& actual_pinned_tabs,
+    const PinnedTabCodec::Tabs& actual_pinned_tabs,
     const SessionStartupPref& backup_startup_pref,
-    const StartupTabs& backup_pinned_tabs)
+    const PinnedTabCodec::Tabs& backup_pinned_tabs)
     : new_startup_pref_(actual_startup_pref),
       backup_startup_pref_(backup_startup_pref),
       new_pinned_tabs_(actual_pinned_tabs),
       backup_pinned_tabs_(backup_pinned_tabs) {
   UMA_HISTOGRAM_ENUMERATION(
       kProtectorHistogramStartupSettingsChanged,
       actual_startup_pref.type,
       SessionStartupPref::TYPE_COUNT);
 }
 
@@ skipping 114 matching lines @@
   // First try to find a URL in new settings that is not present in backup.
   for (size_t i = 0; i < new_urls.size(); ++i) {
     if (!old_urls.count(new_urls[i]))
       return new_urls[i];
   }
   // Then fallback to the first of the current startup URLs - this means that
   // URLs themselves haven't changed.
   return new_urls[0];
 }
 
-void SessionStartupChange::OpenPinnedTabs(Browser* browser,
-                                          const StartupTabs& tabs) {
+void SessionStartupChange::OpenPinnedTabs(
+    Browser* browser,
+    const PinnedTabCodec::Tabs& tabs) {
   for (size_t i = 0; i < tabs.size(); ++i) {
     browser::NavigateParams params(browser, tabs[i].url,
                                    content::PAGE_TRANSITION_START_PAGE);
     params.disposition = NEW_BACKGROUND_TAB;
     params.tabstrip_index = -1;
     params.tabstrip_add_types = TabStripModel::ADD_PINNED;
     params.extension_app_id = tabs[i].app_id;
     browser::Navigate(&params);
   }
 }
 
 BaseSettingChange* CreateSessionStartupChange(
     const SessionStartupPref& actual_startup_pref,
-    const StartupTabs& actual_pinned_tabs,
+    const PinnedTabCodec::Tabs& actual_pinned_tabs,
     const SessionStartupPref& backup_startup_pref,
-    const StartupTabs& backup_pinned_tabs) {
+    const PinnedTabCodec::Tabs& backup_pinned_tabs) {
   return new SessionStartupChange(actual_startup_pref, actual_pinned_tabs,
                                   backup_startup_pref, backup_pinned_tabs);
 }
 
 }  // namespace protector