Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5019)

Unified Diff: chrome/browser/custom_home_pages_table_model.cc

Issue 3046025: Implement most of the startup page controls in DOMUI prefs (Closed)
Patch Set: Addresses review comments Created 10 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: chrome/browser/custom_home_pages_table_model.cc
diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc
index 446aea54c2fcb1a7ba6052ebab81d66ea4def81c..8720a57a48e937f7e6b308fd9435afeee568c65e 100644
--- a/chrome/browser/custom_home_pages_table_model.cc
+++ b/chrome/browser/custom_home_pages_table_model.cc
@@ -8,12 +8,14 @@
#include "app/resource_bundle.h"
#include "app/table_model_observer.h"
#include "base/i18n/rtl.h"
+#include "base/string_util.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"
@@ -84,7 +86,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);
}
}
« no previous file with comments | « no previous file | chrome/browser/dom_ui/browser_options_handler.h » ('j') | chrome/browser/dom_ui/browser_options_handler.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698