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

Side by Side Diff: chrome/browser/ui/views/omnibox/omnibox_view_views.cc

Issue 447183003: Move OmniboxFieldTrial to components (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase & fix switch indent Created 6 years, 4 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/cocoa/omnibox/omnibox_view_mac.mm ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/omnibox/omnibox_view_views.h" 5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"
6 6
7 #include <set> 7 #include <set>
8 8
9 #include "base/command_line.h" 9 #include "base/command_line.h"
10 #include "base/logging.h" 10 #include "base/logging.h"
11 #include "base/metrics/histogram.h" 11 #include "base/metrics/histogram.h"
12 #include "base/strings/string_util.h" 12 #include "base/strings/string_util.h"
13 #include "base/strings/utf_string_conversions.h" 13 #include "base/strings/utf_string_conversions.h"
14 #include "chrome/app/chrome_command_ids.h" 14 #include "chrome/app/chrome_command_ids.h"
15 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h" 15 #include "chrome/browser/autocomplete/chrome_autocomplete_scheme_classifier.h"
16 #include "chrome/browser/command_updater.h" 16 #include "chrome/browser/command_updater.h"
17 #include "chrome/browser/omnibox/omnibox_field_trial.h"
18 #include "chrome/browser/search/search.h" 17 #include "chrome/browser/search/search.h"
19 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h" 18 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"
20 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h" 19 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"
21 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h" 20 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"
22 #include "chrome/browser/ui/view_ids.h" 21 #include "chrome/browser/ui/view_ids.h"
23 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 22 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
24 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h" 23 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"
25 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h" 24 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h"
26 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h " 25 #include "chrome/browser/ui/views/website_settings/website_settings_popup_view.h "
27 #include "components/bookmarks/browser/bookmark_node_data.h" 26 #include "components/bookmarks/browser/bookmark_node_data.h"
28 #include "components/omnibox/autocomplete_input.h" 27 #include "components/omnibox/autocomplete_input.h"
29 #include "components/omnibox/autocomplete_match.h" 28 #include "components/omnibox/autocomplete_match.h"
29 #include "components/omnibox/omnibox_field_trial.h"
30 #include "content/public/browser/web_contents.h" 30 #include "content/public/browser/web_contents.h"
31 #include "extensions/common/constants.h" 31 #include "extensions/common/constants.h"
32 #include "grit/app_locale_settings.h" 32 #include "grit/app_locale_settings.h"
33 #include "grit/generated_resources.h" 33 #include "grit/generated_resources.h"
34 #include "grit/ui_strings.h" 34 #include "grit/ui_strings.h"
35 #include "net/base/escape.h" 35 #include "net/base/escape.h"
36 #include "third_party/skia/include/core/SkColor.h" 36 #include "third_party/skia/include/core/SkColor.h"
37 #include "ui/accessibility/ax_view_state.h" 37 #include "ui/accessibility/ax_view_state.h"
38 #include "ui/aura/client/focus_client.h" 38 #include "ui/aura/client/focus_client.h"
39 #include "ui/aura/window_event_dispatcher.h" 39 #include "ui/aura/window_event_dispatcher.h"
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1041 menu_contents->InsertItemWithStringIdAt( 1041 menu_contents->InsertItemWithStringIdAt(
1042 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL); 1042 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL);
1043 } 1043 }
1044 1044
1045 // Minor note: We use IDC_ for command id here while the underlying textfield 1045 // Minor note: We use IDC_ for command id here while the underlying textfield
1046 // is using IDS_ for all its command ids. This is because views cannot depend 1046 // is using IDS_ for all its command ids. This is because views cannot depend
1047 // on IDC_ for now. 1047 // on IDC_ for now.
1048 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, 1048 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
1049 IDS_EDIT_SEARCH_ENGINES); 1049 IDS_EDIT_SEARCH_ENGINES);
1050 } 1050 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/cocoa/omnibox/omnibox_view_mac.mm ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698