chrome/browser/ui/views/omnibox/omnibox_view_views.cc - Issue 284893003: Move bookmarks/core/... to bookmarks/...

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

Issue 284893003: Move bookmarks/core/... to bookmarks/... (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fixing errors reported by presubmit Created 6 years, 7 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

« no previous file with comments | « chrome/browser/ui/views/bookmarks/bookmark_menu_delegate_unittest.cc ('k') | chrome/browser/ui/views/toolbar/toolbar_view_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/omnibox/omnibox_view_views.h"	5 #include "chrome/browser/ui/views/omnibox/omnibox_view_views.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

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

9 #include "base/metrics/histogram.h"	9 #include "base/metrics/histogram.h"

10 #include "base/strings/string_util.h"	10 #include "base/strings/string_util.h"

11 #include "base/strings/utf_string_conversions.h"	11 #include "base/strings/utf_string_conversions.h"

12 #include "chrome/app/chrome_command_ids.h"	12 #include "chrome/app/chrome_command_ids.h"

13 #include "chrome/browser/autocomplete/autocomplete_input.h"	13 #include "chrome/browser/autocomplete/autocomplete_input.h"

14 #include "chrome/browser/autocomplete/autocomplete_match.h"	14 #include "chrome/browser/autocomplete/autocomplete_match.h"

15 #include "chrome/browser/command_updater.h"	15 #include "chrome/browser/command_updater.h"

16 #include "chrome/browser/search/search.h"	16 #include "chrome/browser/search/search.h"

17 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"	17 #include "chrome/browser/ui/omnibox/omnibox_edit_controller.h"

18 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"	18 #include "chrome/browser/ui/omnibox/omnibox_edit_model.h"

19 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"	19 #include "chrome/browser/ui/omnibox/omnibox_popup_model.h"

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

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

22 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"	22 #include "chrome/browser/ui/views/omnibox/omnibox_popup_contents_view.h"

23 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h"	23 #include "chrome/browser/ui/views/settings_api_bubble_helper_views.h"

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

25 #include "components/bookmarks/core/browser/bookmark_node_data.h"	25 #include "components/bookmarks/browser/bookmark_node_data.h"

26 #include "content/public/browser/web_contents.h"	26 #include "content/public/browser/web_contents.h"

27 #include "extensions/common/constants.h"	27 #include "extensions/common/constants.h"

28 #include "grit/app_locale_settings.h"	28 #include "grit/app_locale_settings.h"

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

30 #include "grit/ui_strings.h"	30 #include "grit/ui_strings.h"

31 #include "net/base/escape.h"	31 #include "net/base/escape.h"

32 #include "third_party/skia/include/core/SkColor.h"	32 #include "third_party/skia/include/core/SkColor.h"

33 #include "ui/accessibility/ax_view_state.h"	33 #include "ui/accessibility/ax_view_state.h"

34 #include "ui/aura/client/focus_client.h"	34 #include "ui/aura/client/focus_client.h"

35 #include "ui/aura/window_event_dispatcher.h"	35 #include "ui/aura/window_event_dispatcher.h"

(...skipping 998 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
1034 menu_contents->InsertItemWithStringIdAt(	1034 menu_contents->InsertItemWithStringIdAt(

1035 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL);	1035 select_all_position + 1, IDS_SHOW_URL, IDS_SHOW_URL);

1036 }	1036 }

1037	1037

1038 // Minor note: We use IDC_ for command id here while the underlying textfield	1038 // Minor note: We use IDC_ for command id here while the underlying textfield

1039 // is using IDS_ for all its command ids. This is because views cannot depend	1039 // is using IDS_ for all its command ids. This is because views cannot depend

1040 // on IDC_ for now.	1040 // on IDC_ for now.

1041 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,	1041 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,

1042 IDS_EDIT_SEARCH_ENGINES);	1042 IDS_EDIT_SEARCH_ENGINES);

1043 }	1043 }

OLD	NEW