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

Side by Side Diff: chrome/browser/task_manager/task_manager_util.cc

Issue 33753002: Sooper experimental refactoring of the profile info cache. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 7 years, 1 month 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/task_manager/task_manager_util.h" 5 #include "chrome/browser/task_manager/task_manager_util.h"
6 6
7 #include "base/basictypes.h" 7 #include "base/basictypes.h"
8 #include "base/i18n/rtl.h" 8 #include "base/i18n/rtl.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
45 return IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX; 45 return IDS_TASK_MANAGER_TAB_INCOGNITO_PREFIX;
46 46
47 return IDS_TASK_MANAGER_TAB_PREFIX; 47 return IDS_TASK_MANAGER_TAB_PREFIX;
48 } 48 }
49 49
50 string16 GetProfileNameFromInfoCache(Profile* profile) { 50 string16 GetProfileNameFromInfoCache(Profile* profile) {
51 DCHECK(profile); 51 DCHECK(profile);
52 52
53 ProfileInfoCache& cache = 53 ProfileInfoCache& cache =
54 g_browser_process->profile_manager()->GetProfileInfoCache(); 54 g_browser_process->profile_manager()->GetProfileInfoCache();
55 size_t index = cache.GetIndexOfProfileWithPath( 55 ProfileInfoEntry entry;
56 profile->GetOriginalProfile()->GetPath()); 56 if (cache.GetInfoForProfile(profile->GetPath(), &entry))
57 if (index == std::string::npos) 57 return entry.GetDisplayName();
58 else
58 return string16(); 59 return string16();
59 else
60 return cache.GetNameOfProfileAtIndex(index);
61 } 60 }
62 61
63 string16 GetTitleFromWebContents(content::WebContents* web_contents) { 62 string16 GetTitleFromWebContents(content::WebContents* web_contents) {
64 DCHECK(web_contents); 63 DCHECK(web_contents);
65 64
66 string16 title = web_contents->GetTitle(); 65 string16 title = web_contents->GetTitle();
67 if (title.empty()) { 66 if (title.empty()) {
68 GURL url = web_contents->GetURL(); 67 GURL url = web_contents->GetURL();
69 title = UTF8ToUTF16(url.spec()); 68 title = UTF8ToUTF16(url.spec());
70 // Force URL to be LTR. 69 // Force URL to be LTR.
71 title = base::i18n::GetDisplayStringInLTRDirectionality(title); 70 title = base::i18n::GetDisplayStringInLTRDirectionality(title);
72 } else { 71 } else {
73 // Since the tab_title will be concatenated with 72 // Since the tab_title will be concatenated with
74 // IDS_TASK_MANAGER_TAB_PREFIX, we need to explicitly set the tab_title to 73 // IDS_TASK_MANAGER_TAB_PREFIX, we need to explicitly set the tab_title to
75 // be LTR format if there is no strong RTL charater in it. Otherwise, if 74 // be LTR format if there is no strong RTL charater in it. Otherwise, if
76 // IDS_TASK_MANAGER_TAB_PREFIX is an RTL word, the concatenated result 75 // IDS_TASK_MANAGER_TAB_PREFIX is an RTL word, the concatenated result
77 // might be wrong. For example, http://mail.yahoo.com, whose title is 76 // might be wrong. For example, http://mail.yahoo.com, whose title is
78 // "Yahoo! Mail: The best web-based Email!", without setting it explicitly 77 // "Yahoo! Mail: The best web-based Email!", without setting it explicitly
79 // as LTR format, the concatenated result will be "!Yahoo! Mail: The best 78 // as LTR format, the concatenated result will be "!Yahoo! Mail: The best
80 // web-based Email :BAT", in which the capital letters "BAT" stands for 79 // web-based Email :BAT", in which the capital letters "BAT" stands for
81 // the Hebrew word for "tab". 80 // the Hebrew word for "tab".
82 base::i18n::AdjustStringForLocaleDirection(&title); 81 base::i18n::AdjustStringForLocaleDirection(&title);
83 } 82 }
84 return title; 83 return title;
85 } 84 }
86 85
87 } // namespace util 86 } // namespace util
88 87
89 } // namespace task_manager 88 } // namespace task_manager
OLDNEW
« no previous file with comments | « chrome/browser/signin/signin_names_io_thread.cc ('k') | chrome/browser/ui/app_list/app_list_service_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698