Chromium Code Reviews| 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 <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" |
| (...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 122 popup_window_mode_(popup_window_mode), | 122 popup_window_mode_(popup_window_mode), |
| 123 security_level_(security_state::SecurityStateModel::NONE), | 123 security_level_(security_state::SecurityStateModel::NONE), |
| 124 saved_selection_for_focus_change_(gfx::Range::InvalidRange()), | 124 saved_selection_for_focus_change_(gfx::Range::InvalidRange()), |
| 125 ime_composing_before_change_(false), | 125 ime_composing_before_change_(false), |
| 126 delete_at_end_pressed_(false), | 126 delete_at_end_pressed_(false), |
| 127 location_bar_view_(location_bar), | 127 location_bar_view_(location_bar), |
| 128 ime_candidate_window_open_(false), | 128 ime_candidate_window_open_(false), |
| 129 select_all_on_mouse_release_(false), | 129 select_all_on_mouse_release_(false), |
| 130 select_all_on_gesture_tap_(false), | 130 select_all_on_gesture_tap_(false), |
| 131 weak_ptr_factory_(this) { | 131 weak_ptr_factory_(this) { |
| 132 SetBorder(views::Border::NullBorder()); | |
|
Evan Stade
2016/10/06 02:05:25
+pkasting for this change
this didn't have any ef
Peter Kasting
2016/10/06 07:12:11
I agree.
| |
| 133 set_id(VIEW_ID_OMNIBOX); | 132 set_id(VIEW_ID_OMNIBOX); |
| 134 SetFontList(font_list); | 133 SetFontList(font_list); |
| 135 } | 134 } |
| 136 | 135 |
| 137 OmniboxViewViews::~OmniboxViewViews() { | 136 OmniboxViewViews::~OmniboxViewViews() { |
| 138 #if defined(OS_CHROMEOS) | 137 #if defined(OS_CHROMEOS) |
| 139 chromeos::input_method::InputMethodManager::Get()-> | 138 chromeos::input_method::InputMethodManager::Get()-> |
| 140 RemoveCandidateWindowObserver(this); | 139 RemoveCandidateWindowObserver(this); |
| 141 #endif | 140 #endif |
| 142 | 141 |
| (...skipping 933 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1076 paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO); | 1075 paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO); |
| 1077 | 1076 |
| 1078 menu_contents->AddSeparator(ui::NORMAL_SEPARATOR); | 1077 menu_contents->AddSeparator(ui::NORMAL_SEPARATOR); |
| 1079 | 1078 |
| 1080 // Minor note: We use IDC_ for command id here while the underlying textfield | 1079 // Minor note: We use IDC_ for command id here while the underlying textfield |
| 1081 // is using IDS_ for all its command ids. This is because views cannot depend | 1080 // is using IDS_ for all its command ids. This is because views cannot depend |
| 1082 // on IDC_ for now. | 1081 // on IDC_ for now. |
| 1083 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, | 1082 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, |
| 1084 IDS_EDIT_SEARCH_ENGINES); | 1083 IDS_EDIT_SEARCH_ENGINES); |
| 1085 } | 1084 } |
| OLD | NEW |