chrome/browser/ui/views/location_bar/location_icon_view.cc - Issue 1855423003: Interpret '?' and Ctrl-K or Ctrl-E as putting omnibox in keyword search mode for Default Search Pro…

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/location_icon_view.cc

Issue 1855423003: Interpret '?' and Ctrl-K or Ctrl-E as putting omnibox in keyword search mode for Default Search Pro… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Add includes for mac tests Created 4 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

OLD	NEW
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/strings/utf_string_conversions.h"	7 #include "base/strings/utf_string_conversions.h"

8 #include "chrome/browser/ssl/chrome_security_state_model_client.h"	8 #include "chrome/browser/ssl/chrome_security_state_model_client.h"

9 #include "chrome/browser/ui/view_ids.h"	9 #include "chrome/browser/ui/view_ids.h"

10 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"	10 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"

11 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "	11 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "

12 #include "chrome/grit/generated_resources.h"	12 #include "chrome/grit/generated_resources.h"

	13 #include "components/omnibox/browser/omnibox_edit_model.h"

13 #include "content/public/browser/navigation_controller.h"	14 #include "content/public/browser/navigation_controller.h"

14 #include "content/public/browser/navigation_entry.h"	15 #include "content/public/browser/navigation_entry.h"

15 #include "content/public/browser/web_contents.h"	16 #include "content/public/browser/web_contents.h"

16 #include "grit/components_scaled_resources.h"	17 #include "grit/components_scaled_resources.h"

17 #include "grit/theme_resources.h"	18 #include "grit/theme_resources.h"

18 #include "ui/base/l10n/l10n_util.h"	19 #include "ui/base/l10n/l10n_util.h"

19 #include "ui/base/material_design/material_design_controller.h"	20 #include "ui/base/material_design/material_design_controller.h"

20 #include "ui/gfx/color_palette.h"	21 #include "ui/gfx/color_palette.h"

21 #include "ui/views/controls/label.h"	22 #include "ui/views/controls/label.h"

22 #include "ui/views/painter.h"	23 #include "ui/views/painter.h"

(...skipping 135 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
158 return size;	159 return size;

159 }	160 }

160	161

161 void LocationIconView::SetBackground(bool should_show_ev) {	162 void LocationIconView::SetBackground(bool should_show_ev) {

162 static const int kEvBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_EV_BUBBLE);	163 static const int kEvBackgroundImages[] = IMAGE_GRID(IDR_OMNIBOX_EV_BUBBLE);

163 if (should_show_ev)	164 if (should_show_ev)

164 SetBackgroundImageGrid(kEvBackgroundImages);	165 SetBackgroundImageGrid(kEvBackgroundImages);

165 else	166 else

166 UnsetBackgroundImageGrid();	167 UnsetBackgroundImageGrid();

167 }	168 }

OLD	NEW

« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | chrome/browser/ui/views/omnibox/omnibox_view_views.h » ('j') | no next file with comments »