Revert 136573 - Extract StartupTabs and startup types from StartupBrowserCreator.

chrome/browser/tabs/pinned_tab_codec.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/tabs/pinned_tab_codec.h"
 
 #include "base/values.h"
 #include "chrome/browser/extensions/extension_tab_helper.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/tabs/tab_strip_model.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/pref_names.h"
 #include "content/public/browser/navigation_entry.h"
 #include "content/public/browser/web_contents.h"
 
 using content::NavigationEntry;
 
+typedef StartupBrowserCreator::LaunchWithProfile::Tab Tab;
+
 // Key used in dictionaries for the app id.
 static const char kAppID[] = "app_id";
 
 // Key used in dictionaries for the url.
 static const char kURL[] = "url";
 
 // Returns true if |browser| has any pinned tabs.
 static bool HasPinnedTabs(Browser* browser) {
   TabStripModel* tab_model = browser->tabstrip_model();
   for (int i = 0; i < tab_model->count(); ++i) {
     if (tab_model->IsTabPinned(i))
       return true;
   }
   return false;
 }
 
 // Adds a DictionaryValue to |values| representing |tab|.
-static void EncodeTab(const StartupTab& tab, ListValue* values) {
+static void EncodeTab(const Tab& tab, ListValue* values) {
   scoped_ptr<DictionaryValue> value(new DictionaryValue);
   value->SetString(kURL, tab.url.spec());
   if (tab.is_app)
     value->SetString(kAppID, tab.app_id);
   values->Append(value.release());
 }
 
 // Adds a DictionaryValue to |values| representing the pinned tab at the
 // specified index.
 static void EncodePinnedTab(TabStripModel* model,
@@ skipping 26 matching lines @@
 
 // Invokes EncodePinnedTab for each pinned tab in browser.
 static void EncodePinnedTabs(Browser* browser, ListValue* values) {
   TabStripModel* tab_model = browser->tabstrip_model();
   for (int i = 0; i < tab_model->count() && tab_model->IsTabPinned(i); ++i)
     EncodePinnedTab(tab_model, i, values);
 }
 
 // Decodes the previously written values in |value| to |tab|, returning true
 // on success.
-static bool DecodeTab(const DictionaryValue& value, StartupTab* tab) {
+static bool DecodeTab(const DictionaryValue& value, Tab* tab) {
   tab->is_app = false;
 
   std::string url_string;
   if (!value.GetString(kURL, &url_string))
     return false;
   tab->url = GURL(url_string);
 
   if (value.GetString(kAppID, &(tab->app_id)))
     tab->is_app = true;
 
@@ skipping 17 matching lines @@
     Browser* browser = *i;
     if (browser->is_type_tabbed() &&
         browser->profile() == profile && HasPinnedTabs(browser)) {
       EncodePinnedTabs(browser, &values);
     }
   }
   prefs->Set(prefs::kPinnedTabs, values);
 }
 
 // static
-void PinnedTabCodec::WritePinnedTabs(Profile* profile,
-                                     const StartupTabs& tabs) {
+void PinnedTabCodec::WritePinnedTabs(Profile* profile, const Tabs& tabs) {
   PrefService* prefs = profile->GetPrefs();
   if (!prefs)
     return;
 
   ListPrefUpdate update(prefs, prefs::kPinnedTabs);
   ListValue* values = update.Get();
   values->Clear();
-  for (StartupTabs::const_iterator i = tabs.begin(); i != tabs.end(); ++i)
+  for (Tabs::const_iterator i = tabs.begin(); i != tabs.end(); ++i)
     EncodeTab(*i, values);
 }
 
 // static
-StartupTabs PinnedTabCodec::ReadPinnedTabs(Profile* profile) {
+PinnedTabCodec::Tabs PinnedTabCodec::ReadPinnedTabs(Profile* profile) {
   PrefService* prefs = profile->GetPrefs();
   if (!prefs)
-    return StartupTabs();
+    return Tabs();
   return ReadPinnedTabs(prefs->GetList(prefs::kPinnedTabs));
 }
 
 // static
-StartupTabs PinnedTabCodec::ReadPinnedTabs(const base::Value* value) {
-  StartupTabs results;
+PinnedTabCodec::Tabs PinnedTabCodec::ReadPinnedTabs(const base::Value* value) {
+  Tabs results;
 
   const base::ListValue* tabs_list = NULL;
   if (!value->GetAsList(&tabs_list))
     return results;
 
   for (size_t i = 0, max = tabs_list->GetSize(); i < max; ++i) {
     base::DictionaryValue* tab_values = NULL;
     if (tabs_list->GetDictionary(i, &tab_values)) {
-      StartupTab tab;
+      Tab tab;
       if (DecodeTab(*tab_values, &tab))
         results.push_back(tab);
     }
   }
   return results;
 }