Don't add devtools to list of startup pages

chrome/browser/custom_home_pages_table_model.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/custom_home_pages_table_model.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/rtl.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_list.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "content/public/browser/web_contents.h"
 #include "googleurl/src/gurl.h"
 #include "grit/generated_resources.h"
 #include "grit/ui_resources.h"
 #include "net/base/net_util.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/gfx/codec/png_codec.h"
 
+namespace {
+
+// Checks whether the given URL should count as one of the "current" pages.
+// Returns true for all pages except dev tools and settings.
+bool ShouldAddPage(const GURL& url) {
+  if (url.is_empty())
+    return false;
+
+  if (url.SchemeIs(chrome::kChromeDevToolsScheme))
+    return false;
+
+  if (url.SchemeIs(chrome::kChromeUIScheme)) {
+    if (url.host() == chrome::kChromeUISettingsHost)
+      return false;
+
+    // For a settings page, the path will start with "/settings" not "settings"
+    // so find() will return 1, not 0.
+    if (url.host() == chrome::kChromeUIUberHost &&
+        url.path().find(chrome::kChromeUISettingsHost) == 1) {

[Evan Stade, 2012/03/12 20:14:11]

This also catches chrome://chrome/settings-foo

I guess it doesn't matter as we don't have any URLs of that form and it seems
unlikely (although not impossible) that we would ever start using one.

+      return false;
+    }
+  }
+
+  return true;
+}
+
+}  // namespace
+
 struct CustomHomePagesTableModel::Entry {
   Entry() : title_handle(0) {}
 
   // URL of the page.
   GURL url;
 
   // Page title.  If this is empty, we'll display the URL as the entry.
   string16 title;
 
   // If non-zero, indicates we're loading the title for the page.
@@ skipping 111 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->GetWebContentsAt(tab_index)->GetURL();
-      // TODO(tbreisacher) remove kChromeUISettingsHost  once options is deleted
-      // and replaced by options2
-      if (!url.is_empty() &&
-          !(url.SchemeIs(chrome::kChromeUIScheme) &&
-            (url.host() == chrome::kChromeUISettingsHost ||
-             url.host() == chrome::kChromeUIUberHost))) {
+      if (ShouldAddPage(url)) {

[Evan Stade, 2012/03/12 20:14:11]

no curlies

         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;
@@ skipping 64 matching lines @@
   return NULL;
 }
 
 string16 CustomHomePagesTableModel::FormattedURL(int row) const {
   std::string languages =
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
   string16 url = net::FormatUrl(entries_[row].url, languages);
   url = base::i18n::GetDisplayStringInLTRDirectionality(url);
   return url;
 }