diff options
| author | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 14:01:46 +0000 |
|---|---|---|
| committer | mnissler@chromium.org <mnissler@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-08-26 14:01:46 +0000 |
| commit | b0c78f6652344e141ff2b7da804ed84351a2ae8a (patch) | |
| tree | dc610d78a7350efa0029116d2c5be0e901ee7a15 /chrome/browser/custom_home_pages_table_model.cc | |
| parent | f946edc1d03dda4c4fed3ff05b8c317f1b18fa7a (diff) | |
| download | chromium_src-b0c78f6652344e141ff2b7da804ed84351a2ae8a.zip chromium_src-b0c78f6652344e141ff2b7da804ed84351a2ae8a.tar.gz chromium_src-b0c78f6652344e141ff2b7da804ed84351a2ae8a.tar.bz2 | |
Implement a policy to specify which pages to restore at startup. The admin can choose no restore, last opened windows, or specific pages to be opened.
xib changes: Added an enabled binding to the policy-controlled "Restore on Startup" radiobox group in the "Basic" preference pane. They can be disabled when their value is overridden by policy. The methods for the bindings are in the preference window controller.
BUG=49297
TEST=ConfigurationPolicyPrefStoreTest.* and ConfigurationPolicyProviderWinTest.* Manual tests: Set the policies externally. Check that appropriate restore action is done at startup. Check that the Restore on Startup buttons are disabled.
Review URL: http://codereview.chromium.org/3115021
Patch from Jean-Luc Brouillet <jeanluc@google.com>.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@57513 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 | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/chrome/browser/custom_home_pages_table_model.cc b/chrome/browser/custom_home_pages_table_model.cc index 585b41d0..a3c58bb 100644 --- a/chrome/browser/custom_home_pages_table_model.cc +++ b/chrome/browser/custom_home_pages_table_model.cc @@ -57,6 +57,8 @@ void CustomHomePagesTableModel::SetURLs(const std::vector<GURL>& urls) { entries_.resize(urls.size()); for (size_t i = 0; i < urls.size(); ++i) { entries_[i].url = urls[i]; + entries_[i].title.erase(); + entries_[i].icon.reset(); LoadTitleAndFavIcon(&(entries_[i])); } // Complete change, so tell the view to just rebuild itself. |