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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_icon_view.cc

Issue 15949029: Use a direct include of utf_string_conversions.h in chrome/browser/ui/, part 2. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 7 years, 6 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 | Annotate | Revision Log
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/ui/views/location_bar/location_icon_view.h" 5 #include "chrome/browser/ui/views/location_bar/location_icon_view.h"
6 6
7 #include "base/utf_string_conversions.h" 7 #include "base/strings/utf_string_conversions.h"
8 #include "grit/generated_resources.h" 8 #include "grit/generated_resources.h"
9 #include "ui/base/l10n/l10n_util.h" 9 #include "ui/base/l10n/l10n_util.h"
10 10
11 LocationIconView::LocationIconView(LocationBarView* location_bar) 11 LocationIconView::LocationIconView(LocationBarView* location_bar)
12 : page_info_helper_(this, location_bar) { 12 : page_info_helper_(this, location_bar) {
13 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON)); 13 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON));
14 TouchableLocationBarView::Init(this); 14 TouchableLocationBarView::Init(this);
15 } 15 }
16 16
17 LocationIconView::~LocationIconView() { 17 LocationIconView::~LocationIconView() {
(...skipping 20 matching lines...) Expand all
38 return GetBuiltInHorizontalPaddingImpl(); 38 return GetBuiltInHorizontalPaddingImpl();
39 } 39 }
40 40
41 void LocationIconView::ShowTooltip(bool show) { 41 void LocationIconView::ShowTooltip(bool show) {
42 if (show) { 42 if (show) {
43 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON)); 43 SetTooltipText(l10n_util::GetStringUTF16(IDS_TOOLTIP_LOCATION_ICON));
44 } else { 44 } else {
45 SetTooltipText(string16()); 45 SetTooltipText(string16());
46 } 46 }
47 } 47 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698