Re-land 53849 (Revert 53857) - Implement most of the startup page controls in...

chrome/browser/custom_home_pages_table_model.cc

 // Copyright (c) 2010 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/custom_home_pages_table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "app/table_model_observer.h"
 #include "base/i18n/rtl.h"
 #include "chrome/browser/browser.h"
 #include "chrome/browser/browser_list.h"
 #include "chrome/browser/pref_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/tab_contents/tab_contents.h"
 #include "chrome/common/pref_names.h"
+#include "chrome/common/url_constants.h"
 #include "gfx/codec/png_codec.h"
 #include "grit/app_resources.h"
 #include "grit/generated_resources.h"
 #include "net/base/net_util.h"
 
 CustomHomePagesTableModel::CustomHomePagesTableModel(Profile* profile)
     : default_favicon_(NULL),
       profile_(profile),
       observer_(NULL) {
   ResourceBundle& rb = ResourceBundle::GetSharedInstance();
@@ skipping 49 matching lines @@
   // And add all tabs for all open browsers with our profile.
   int add_index = 0;
   for (BrowserList::const_iterator browser_i = BrowserList::begin();
        browser_i != BrowserList::end(); ++browser_i) {
     Browser* browser = *browser_i;
     if (browser->profile() != profile_)
       continue;  // Skip incognito browsers.
 
     for (int tab_index = 0; tab_index < browser->tab_count(); ++tab_index) {
       const GURL url = browser->GetTabContentsAt(tab_index)->GetURL();
-      if (!url.is_empty())
+      if (!url.is_empty() &&
+          !(url.SchemeIs(chrome::kChromeUIScheme) &&
+            url.host() == chrome::kChromeUIOptionsHost))
         Add(add_index++, url);
     }
   }
 }
 
 std::vector<GURL> CustomHomePagesTableModel::GetURLs() {
   std::vector<GURL> urls(entries_.size());
   for (size_t i = 0; i < entries_.size(); ++i)
     urls[i] = entries_[i].url;
   return urls;
@@ skipping 105 matching lines @@
   return NULL;
 }
 
 std::wstring CustomHomePagesTableModel::FormattedURL(int row) const {
   std::wstring languages =
       UTF8ToWide(profile_->GetPrefs()->GetString(prefs::kAcceptLanguages));
   std::wstring url(net::FormatUrl(entries_[row].url, languages));
   base::i18n::GetDisplayStringInLTRDirectionality(&url);
   return url;
 }