Disclude Settings window and settings-frame from 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/prefs/pref_service.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_iterator.h"
 #include "chrome/browser/ui/browser_list.h"
+#include "chrome/browser/ui/settings_window_manager.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "chrome/grit/generated_resources.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/url_formatter/url_formatter.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/models/table_model_observer.h"
 #include "ui/gfx/codec/png_codec.h"
 #include "url/gurl.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(content::kChromeDevToolsScheme))
     return false;
 
   if (url.SchemeIs(content::kChromeUIScheme)) {
-    if (url.host() == chrome::kChromeUISettingsHost)
+    if (url.host() == chrome::kChromeUISettingsHost ||
+        url.host() == chrome::kChromeUISettingsFrameHost) {
       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) {
       return false;
     }
   }
 
   return true;
@@ skipping 125 matching lines @@
 
 void CustomHomePagesTableModel::SetToCurrentlyOpenPages() {
   // Remove the current entries.
   while (RowCount())
     RemoveWithoutNotification(0);
 
   // And add all tabs for all open browsers with our profile.
   int add_index = 0;
   for (chrome::BrowserIterator it; !it.done(); it.Next()) {
     Browser* browser = *it;
     if (browser->profile() != profile_)

[sky, 2015/10/27 13:07:46]

Can you move this and your new if into a ShouldAddBrowser() function?

[stevenjb, 2015/10/27 16:30:49]

Done.

       continue;  // Skip incognito browsers.
+    if (chrome::SettingsWindowManager::GetInstance()->IsSettingsBrowser(
+            browser)) {
+      continue;  // Skip the Settings window.
+    }
 
     for (int tab_index = 0;
          tab_index < browser->tab_strip_model()->count();
          ++tab_index) {
       const GURL url =
           browser->tab_strip_model()->GetWebContentsAt(tab_index)->GetURL();
       if (ShouldAddPage(url))
         AddWithoutNotification(add_index++, url);
     }
   }
@@ skipping 102 matching lines @@
   }
 }
 
 base::string16 CustomHomePagesTableModel::FormattedURL(int row) const {
   std::string languages =
       profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
   base::string16 url = url_formatter::FormatUrl(entries_[row].url, languages);
   url = base::i18n::GetDisplayStringInLTRDirectionality(url);
   return url;
 }