chrome/browser/ui/views/location_bar/selected_keyword_view.cc - Issue 6204002: Carnitas: Remove chrome/browser/views, update references.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 6204002: Carnitas: Remove chrome/browser/views, update references. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Yay, more syncing Created 9 years, 11 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

« no previous file with comments | « chrome/browser/ui/views/location_bar/selected_keyword_view.h ('k') | chrome/browser/ui/views/location_bar/star_view.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 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/views/location_bar/selected_keyword_view.h"	5 #include "chrome/browser/ui/views/location_bar/selected_keyword_view.h"

6	6

7 #include "app/l10n_util.h"	7 #include "app/l10n_util.h"

8 #include "base/logging.h"	8 #include "base/logging.h"

9 #include "base/utf_string_conversions.h"	9 #include "base/utf_string_conversions.h"

10 #include "chrome/browser/search_engines/template_url_model.h"	10 #include "chrome/browser/search_engines/template_url_model.h"

11 #include "chrome/browser/profiles/profile.h"	11 #include "chrome/browser/profiles/profile.h"

12 #include "chrome/browser/ui/omnibox/location_bar_util.h"	12 #include "chrome/browser/ui/omnibox/location_bar_util.h"

13 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"	13 #include "chrome/browser/ui/views/location_bar/keyword_hint_view.h"

14 #include "grit/generated_resources.h"	14 #include "grit/generated_resources.h"

15	15

(...skipping 49 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
65 IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;	65 IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;

66 full_label_.SetText(UTF16ToWide(	66 full_label_.SetText(UTF16ToWide(

67 l10n_util::GetStringFUTF16(message_id, short_name)));	67 l10n_util::GetStringFUTF16(message_id, short_name)));

68 const std::wstring min_string(	68 const std::wstring min_string(

69 location_bar_util::CalculateMinString(UTF16ToWide(short_name)));	69 location_bar_util::CalculateMinString(UTF16ToWide(short_name)));

70 partial_label_.SetText(min_string.empty() ?	70 partial_label_.SetText(min_string.empty() ?

71 full_label_.GetText() :	71 full_label_.GetText() :

72 UTF16ToWide(l10n_util::GetStringFUTF16(message_id,	72 UTF16ToWide(l10n_util::GetStringFUTF16(message_id,

73 WideToUTF16(min_string))));	73 WideToUTF16(min_string))));

74 }	74 }

OLD	NEW