OLD | NEW |
---|---|
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "chrome/browser/custom_home_pages_table_model.h" | 5 #include "chrome/browser/custom_home_pages_table_model.h" |
6 | 6 |
7 #include <stddef.h> | 7 #include <stddef.h> |
8 | 8 |
9 #include "base/bind.h" | 9 #include "base/bind.h" |
10 #include "base/bind_helpers.h" | 10 #include "base/bind_helpers.h" |
11 #include "base/i18n/rtl.h" | 11 #include "base/i18n/rtl.h" |
12 #include "base/strings/utf_string_conversions.h" | 12 #include "base/strings/utf_string_conversions.h" |
13 #include "chrome/browser/history/history_service_factory.h" | 13 #include "chrome/browser/history/history_service_factory.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/ui/browser.h" | 15 #include "chrome/browser/ui/browser.h" |
16 #include "chrome/browser/ui/browser_list.h" | 16 #include "chrome/browser/ui/browser_list.h" |
17 #include "chrome/browser/ui/settings_window_manager.h" | 17 #include "chrome/browser/ui/settings_window_manager.h" |
18 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 18 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
19 #include "chrome/common/url_constants.h" | 19 #include "chrome/common/url_constants.h" |
20 #include "chrome/grit/generated_resources.h" | 20 #include "chrome/grit/generated_resources.h" |
21 #include "components/history/core/browser/history_service.h" | 21 #include "components/history/core/browser/history_service.h" |
22 #include "components/url_formatter/url_formatter.h" | 22 #include "components/url_formatter/url_formatter.h" |
23 #include "content/public/browser/web_contents.h" | 23 #include "content/public/browser/web_contents.h" |
24 #include "ui/base/l10n/l10n_util.h" | 24 #include "ui/base/l10n/l10n_util.h" |
25 #include "ui/base/models/table_model_observer.h" | 25 #include "ui/base/models/table_model_observer.h" |
26 #include "ui/gfx/codec/png_codec.h" | 26 #include "ui/gfx/codec/png_codec.h" |
27 #include "url/gurl.h" | 27 #include "url/gurl.h" |
28 | 28 |
29 namespace { | |
30 | |
31 // Checks whether the given URL should count as one of the "current" pages. | |
32 // Returns true for all pages except dev tools and settings. | |
33 bool ShouldAddPage(const GURL& url) { | |
34 if (url.is_empty()) | |
35 return false; | |
36 | |
37 if (url.SchemeIs(content::kChromeDevToolsScheme)) | |
38 return false; | |
39 | |
40 if (url.SchemeIs(content::kChromeUIScheme)) { | |
sky
2017/06/07 16:08:48
How come none of the following matters anymore?
Dan Beam
2017/06/07 22:49:14
this code was a roundabout way to ignore the WebCo
| |
41 if (url.host_piece() == chrome::kChromeUISettingsHost || | |
42 url.host_piece() == chrome::kChromeUISettingsFrameHost) { | |
43 return false; | |
44 } | |
45 | |
46 // For a settings page, the path will start with "/settings" not "settings" | |
47 // so find() will return 1, not 0. | |
48 if (url.host_piece() == chrome::kChromeUIUberHost && | |
49 url.path_piece().find(chrome::kChromeUISettingsHost) == 1) { | |
50 return false; | |
51 } | |
52 } | |
53 | |
54 return true; | |
55 } | |
56 | |
57 } // namespace | |
58 | |
59 struct CustomHomePagesTableModel::Entry { | 29 struct CustomHomePagesTableModel::Entry { |
60 Entry() : task_id(base::CancelableTaskTracker::kBadTaskId) {} | 30 Entry() : task_id(base::CancelableTaskTracker::kBadTaskId) {} |
61 | 31 |
62 // URL of the page. | 32 // URL of the page. |
63 GURL url; | 33 GURL url; |
64 | 34 |
65 // Page title. If this is empty, we'll display the URL as the entry. | 35 // Page title. If this is empty, we'll display the URL as the entry. |
66 base::string16 title; | 36 base::string16 title; |
67 | 37 |
68 // If not |base::CancelableTaskTracker::kBadTaskId|, indicates we're loading | 38 // If not |base::CancelableTaskTracker::kBadTaskId|, indicates we're loading |
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
171 } | 141 } |
172 entries_.erase(entries_.begin() + static_cast<size_t>(index)); | 142 entries_.erase(entries_.begin() + static_cast<size_t>(index)); |
173 } | 143 } |
174 | 144 |
175 void CustomHomePagesTableModel::Remove(int index) { | 145 void CustomHomePagesTableModel::Remove(int index) { |
176 RemoveWithoutNotification(index); | 146 RemoveWithoutNotification(index); |
177 if (observer_) | 147 if (observer_) |
178 observer_->OnItemsRemoved(index, 1); | 148 observer_->OnItemsRemoved(index, 1); |
179 } | 149 } |
180 | 150 |
181 void CustomHomePagesTableModel::SetToCurrentlyOpenPages() { | 151 void CustomHomePagesTableModel::SetToCurrentlyOpenPages( |
152 const content::WebContents* source_contents) { | |
182 // Remove the current entries. | 153 // Remove the current entries. |
183 while (RowCount()) | 154 while (RowCount()) |
184 RemoveWithoutNotification(0); | 155 RemoveWithoutNotification(0); |
185 | 156 |
186 // Add tabs from appropriate browser windows. | 157 // Add tabs from appropriate browser windows. |
187 int add_index = 0; | 158 int add_index = 0; |
188 for (auto* browser : *BrowserList::GetInstance()) { | 159 for (auto* browser : *BrowserList::GetInstance()) { |
189 if (!ShouldIncludeBrowser(browser)) | 160 if (!ShouldIncludeBrowser(browser)) |
190 continue; | 161 continue; |
191 | 162 |
192 for (int tab_index = 0; | 163 for (int tab_index = 0; |
193 tab_index < browser->tab_strip_model()->count(); | 164 tab_index < browser->tab_strip_model()->count(); |
194 ++tab_index) { | 165 ++tab_index) { |
195 const GURL url = | 166 const content::WebContents* contents = |
196 browser->tab_strip_model()->GetWebContentsAt(tab_index)->GetURL(); | 167 browser->tab_strip_model()->GetWebContentsAt(tab_index); |
197 if (ShouldAddPage(url)) | 168 if (contents == source_contents) |
169 continue; | |
170 const GURL url = contents->GetURL(); | |
171 if (!url.is_empty() && !url.SchemeIs(content::kChromeDevToolsScheme)) | |
Dan Beam
2017/06/07 22:49:14
and the empty and devtools check is still here
| |
198 AddWithoutNotification(add_index++, url); | 172 AddWithoutNotification(add_index++, url); |
199 } | 173 } |
200 } | 174 } |
201 LoadAllTitles(); | 175 LoadAllTitles(); |
202 } | 176 } |
203 | 177 |
204 std::vector<GURL> CustomHomePagesTableModel::GetURLs() { | 178 std::vector<GURL> CustomHomePagesTableModel::GetURLs() { |
205 std::vector<GURL> urls(entries_.size()); | 179 std::vector<GURL> urls(entries_.size()); |
206 for (size_t i = 0; i < entries_.size(); ++i) | 180 for (size_t i = 0; i < entries_.size(); ++i) |
207 urls[i] = entries_[i].url; | 181 urls[i] = entries_[i].url; |
(...skipping 105 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
313 if (observer_ && observable) | 287 if (observer_ && observable) |
314 observer_->OnItemsChanged(static_cast<int>(entry_index), 1); | 288 observer_->OnItemsChanged(static_cast<int>(entry_index), 1); |
315 } | 289 } |
316 } | 290 } |
317 | 291 |
318 base::string16 CustomHomePagesTableModel::FormattedURL(int row) const { | 292 base::string16 CustomHomePagesTableModel::FormattedURL(int row) const { |
319 base::string16 url = url_formatter::FormatUrl(entries_[row].url); | 293 base::string16 url = url_formatter::FormatUrl(entries_[row].url); |
320 url = base::i18n::GetDisplayStringInLTRDirectionality(url); | 294 url = base::i18n::GetDisplayStringInLTRDirectionality(url); |
321 return url; | 295 return url; |
322 } | 296 } |
OLD | NEW |