chrome/browser/ui/views/location_bar/selected_keyword_view.cc - Issue 5582002: Move:...

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 5582002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 10 years 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/location_bar_view.cc ('k') | chrome/browser/ui/views/location_bar/star_view.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2010 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/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 "chrome/browser/search_engines/template_url_model.h"	9 #include "chrome/browser/search_engines/template_url_model.h"

10 #include "chrome/browser/location_bar_util.h"

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

12 #include "chrome/browser/views/location_bar/keyword_hint_view.h"	11 #include "chrome/browser/ui/omnibox/location_bar_util.h"

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

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

14	14

15 SelectedKeywordView::SelectedKeywordView(const int background_images[],	15 SelectedKeywordView::SelectedKeywordView(const int background_images[],

16 int contained_image,	16 int contained_image,

17 const SkColor& color,	17 const SkColor& color,

18 Profile* profile)	18 Profile* profile)

19 : IconLabelBubbleView(background_images, contained_image, color),	19 : IconLabelBubbleView(background_images, contained_image, color),

20 profile_(profile) {	20 profile_(profile) {

21 full_label_.SetVisible(false);	21 full_label_.SetVisible(false);

22 partial_label_.SetVisible(false);	22 partial_label_.SetVisible(false);

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
62 GetKeywordShortName(keyword, &is_extension_keyword);	62 GetKeywordShortName(keyword, &is_extension_keyword);

63 int message_id = is_extension_keyword ?	63 int message_id = is_extension_keyword ?

64 IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;	64 IDS_OMNIBOX_EXTENSION_KEYWORD_TEXT : IDS_OMNIBOX_KEYWORD_TEXT;

65 full_label_.SetText(l10n_util::GetStringF(message_id, short_name));	65 full_label_.SetText(l10n_util::GetStringF(message_id, short_name));

66 const std::wstring min_string(	66 const std::wstring min_string(

67 location_bar_util::CalculateMinString(short_name));	67 location_bar_util::CalculateMinString(short_name));

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

69 full_label_.GetText() :	69 full_label_.GetText() :

70 l10n_util::GetStringF(message_id, min_string));	70 l10n_util::GetStringF(message_id, min_string));

71 }	71 }

OLD	NEW