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 "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/i18n/rtl.h" | 9 #include "base/i18n/rtl.h" |
10 #include "base/prefs/pref_service.h" | 10 #include "base/prefs/pref_service.h" |
11 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
12 #include "chrome/browser/history/history_service_factory.h" | 12 #include "chrome/browser/history/history_service_factory.h" |
13 #include "chrome/browser/profiles/profile.h" | 13 #include "chrome/browser/profiles/profile.h" |
14 #include "chrome/browser/ui/browser.h" | 14 #include "chrome/browser/ui/browser.h" |
15 #include "chrome/browser/ui/browser_iterator.h" | 15 #include "chrome/browser/ui/browser_iterator.h" |
16 #include "chrome/browser/ui/browser_list.h" | 16 #include "chrome/browser/ui/browser_list.h" |
17 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 17 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
18 #include "chrome/common/pref_names.h" | 18 #include "chrome/common/pref_names.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 "content/public/browser/web_contents.h" | 23 #include "content/public/browser/web_contents.h" |
23 #include "net/base/net_util.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 { | 29 namespace { |
30 | 30 |
31 // Checks whether the given URL should count as one of the "current" pages. | 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. | 32 // Returns true for all pages except dev tools and settings. |
33 bool ShouldAddPage(const GURL& url) { | 33 bool ShouldAddPage(const GURL& url) { |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
298 if (found_url && !row.title().empty()) { | 298 if (found_url && !row.title().empty()) { |
299 entry->title = row.title(); | 299 entry->title = row.title(); |
300 if (observer_ && observable) | 300 if (observer_ && observable) |
301 observer_->OnItemsChanged(static_cast<int>(entry_index), 1); | 301 observer_->OnItemsChanged(static_cast<int>(entry_index), 1); |
302 } | 302 } |
303 } | 303 } |
304 | 304 |
305 base::string16 CustomHomePagesTableModel::FormattedURL(int row) const { | 305 base::string16 CustomHomePagesTableModel::FormattedURL(int row) const { |
306 std::string languages = | 306 std::string languages = |
307 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages); | 307 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages); |
308 base::string16 url = net::FormatUrl(entries_[row].url, languages); | 308 base::string16 url = url_formatter::FormatUrl(entries_[row].url, languages); |
309 url = base::i18n::GetDisplayStringInLTRDirectionality(url); | 309 url = base::i18n::GetDisplayStringInLTRDirectionality(url); |
310 return url; | 310 return url; |
311 } | 311 } |
OLD | NEW |