diff options
| author | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 21:54:31 +0000 |
|---|---|---|
| committer | stuartmorgan@chromium.org <stuartmorgan@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-07-28 21:54:31 +0000 |
| commit | 42dc0c200a52e7644f22156c4839ae414ae941d6 (patch) | |
| tree | 65fd8abda15df97be83c9c72ea8b40f7009ad534 /chrome/browser/custom_home_pages_table_model.cc | |
| parent | 5de3c6834b77d8b3eeec7b5d7175a2ab246ea234 (diff) | |
| download | chromium_src-42dc0c200a52e7644f22156c4839ae414ae941d6.zip chromium_src-42dc0c200a52e7644f22156c4839ae414ae941d6.tar.gz chromium_src-42dc0c200a52e7644f22156c4839ae414ae941d6.tar.bz2 | |
Re-land 53849 (Revert 53857) - Implement most of the startup page controls in DOMUI prefs
Hooks up display of startup pages, removal of pages, and setting the startup pages to the currently open tabs.
Uses a select for now, but will eventually be replaced with a List so the favicons can be displayed.
BUG=48713
TEST=Startup pages can be viewed, removed, and set to current in DOMUI prefs.
Review URL: http://codereview.chromium.org/3046025
TBR=stuartmorgan@chromium.org
Review URL: http://codereview.chromium.org/3058018
TBR=stuartmorgan@chromium.org
Review URL: http://codereview.chromium.org/3032035
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@54031 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/custom_home_pages_table_model.cc')
| -rw-r--r-- | chrome/browser/custom_home_pages_table_model.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc index 6095afe..90dd523 100644 --- a/chrome/browser/custom_home_pages_table_model.cc +++ b/chrome/browser/custom_home_pages_table_model.cc @@ -14,6 +14,7 @@ #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" @@ -83,7 +84,9 @@ void CustomHomePagesTableModel::SetToCurrentlyOpenPages() { 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); } } |