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

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 6 years, 3 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/selected_keyword_view.h" 5 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/profiles/profile.h" 9 #include "chrome/browser/profiles/profile.h"
10 #include "chrome/browser/search_engines/template_url_service_factory.h" 10 #include "chrome/browser/search_engines/template_url_service_factory.h"
11 #include "chrome/browser/ui/location_bar/location_bar_util.h" 11 #include "chrome/browser/ui/location_bar/location_bar_util.h"
12 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h" 12 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"
13 #include "chrome/grit/generated_resources.h"
13 #include "components/search_engines/template_url_service.h" 14 #include "components/search_engines/template_url_service.h"
14 #include "grit/generated_resources.h"
15 #include "grit/theme_resources.h" 15 #include "grit/theme_resources.h"
16 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
17 #include "ui/views/painter.h" 17 #include "ui/views/painter.h"
18 18
19 19
20 namespace { 20 namespace {
21 const int kBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_SELECTED_KEYWORD_BUBBLE); 21 const int kBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_SELECTED_KEYWORD_BUBBLE);
22 } 22 }
23 23
24 24
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
74 full_label_.SetText(full_name); 74 full_label_.SetText(full_name);
75 75
76 const base::string16 min_string( 76 const base::string16 min_string(
77 location_bar_util::CalculateMinString(short_name)); 77 location_bar_util::CalculateMinString(short_name));
78 const base::string16 partial_name = is_extension_keyword ? 78 const base::string16 partial_name = is_extension_keyword ?
79 min_string : 79 min_string :
80 l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string); 80 l10n_util::GetStringFUTF16(IDS_OMNIBOX_KEYWORD_TEXT, min_string);
81 partial_label_.SetText(min_string.empty() ? 81 partial_label_.SetText(min_string.empty() ?
82 full_label_.text() : partial_name); 82 full_label_.text() : partial_name);
83 } 83 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/open_pdf_in_reader_view.cc ('k') | chrome/browser/ui/views/location_bar/star_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698