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

Side by Side Diff: chrome/browser/custom_home_pages_table_model.cc

Issue 1841653003: Drop |languages| from {Format,Elide}Url* and IDNToUnicode (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix typo in elide_url.cc Created 4 years, 8 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 unified diff | Download patch
OLDNEW
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/pref_names.h"
20 #include "chrome/common/url_constants.h" 19 #include "chrome/common/url_constants.h"
21 #include "chrome/grit/generated_resources.h" 20 #include "chrome/grit/generated_resources.h"
22 #include "components/history/core/browser/history_service.h" 21 #include "components/history/core/browser/history_service.h"
23 #include "components/prefs/pref_service.h"
24 #include "components/url_formatter/url_formatter.h" 22 #include "components/url_formatter/url_formatter.h"
25 #include "content/public/browser/web_contents.h" 23 #include "content/public/browser/web_contents.h"
26 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
27 #include "ui/base/models/table_model_observer.h" 25 #include "ui/base/models/table_model_observer.h"
28 #include "ui/gfx/codec/png_codec.h" 26 #include "ui/gfx/codec/png_codec.h"
29 #include "url/gurl.h" 27 #include "url/gurl.h"
30 28
31 namespace { 29 namespace {
32 30
33 // 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.
(...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after
311 } 309 }
312 entry->task_id = base::CancelableTaskTracker::kBadTaskId; 310 entry->task_id = base::CancelableTaskTracker::kBadTaskId;
313 if (found_url && !row.title().empty()) { 311 if (found_url && !row.title().empty()) {
314 entry->title = row.title(); 312 entry->title = row.title();
315 if (observer_ && observable) 313 if (observer_ && observable)
316 observer_->OnItemsChanged(static_cast<int>(entry_index), 1); 314 observer_->OnItemsChanged(static_cast<int>(entry_index), 1);
317 } 315 }
318 } 316 }
319 317
320 base::string16 CustomHomePagesTableModel::FormattedURL(int row) const { 318 base::string16 CustomHomePagesTableModel::FormattedURL(int row) const {
321 std::string languages = 319 base::string16 url = url_formatter::FormatUrl(entries_[row].url);
322 profile_->GetPrefs()->GetString(prefs::kAcceptLanguages);
323 base::string16 url = url_formatter::FormatUrl(entries_[row].url, languages);
324 url = base::i18n::GetDisplayStringInLTRDirectionality(url); 320 url = base::i18n::GetDisplayStringInLTRDirectionality(url);
325 return url; 321 return url;
326 } 322 }
OLDNEW
« no previous file with comments | « chrome/browser/content_settings/tab_specific_content_settings.cc ('k') | chrome/browser/dom_distiller/tab_utils_android.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698