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

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

Issue 2527983003: Omnibox: Fix unnecessary inside border (Closed)
Patch Set: move to OmniboxViewViews Created 4 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
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | no next file » | 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"
(...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 146
147 if (popup_window_mode_) 147 if (popup_window_mode_)
148 SetReadOnly(true); 148 SetReadOnly(true);
149 149
150 if (location_bar_view_) { 150 if (location_bar_view_) {
151 // Initialize the popup view using the same font. 151 // Initialize the popup view using the same font.
152 popup_view_.reset(OmniboxPopupContentsView::Create( 152 popup_view_.reset(OmniboxPopupContentsView::Create(
153 GetFontList(), this, model(), location_bar_view_)); 153 GetFontList(), this, model(), location_bar_view_));
154 } 154 }
155 155
156 // Override the default FocusableBorder from Textfield, since the
157 // LocationBarView will indicate the focus state.
158 SetBorder(views::NullBorder());
159
156 #if defined(OS_CHROMEOS) 160 #if defined(OS_CHROMEOS)
157 chromeos::input_method::InputMethodManager::Get()-> 161 chromeos::input_method::InputMethodManager::Get()->
158 AddCandidateWindowObserver(this); 162 AddCandidateWindowObserver(this);
159 #endif 163 #endif
160 } 164 }
161 165
162 void OmniboxViewViews::SaveStateToTab(content::WebContents* tab) { 166 void OmniboxViewViews::SaveStateToTab(content::WebContents* tab) {
163 DCHECK(tab); 167 DCHECK(tab);
164 168
165 // We don't want to keep the IME status, so force quit the current 169 // We don't want to keep the IME status, so force quit the current
(...skipping 895 matching lines...) Expand 10 before | Expand all | Expand 10 after
1061 paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO); 1065 paste_position + 1, IDS_PASTE_AND_GO, IDS_PASTE_AND_GO);
1062 1066
1063 menu_contents->AddSeparator(ui::NORMAL_SEPARATOR); 1067 menu_contents->AddSeparator(ui::NORMAL_SEPARATOR);
1064 1068
1065 // Minor note: We use IDC_ for command id here while the underlying textfield 1069 // Minor note: We use IDC_ for command id here while the underlying textfield
1066 // is using IDS_ for all its command ids. This is because views cannot depend 1070 // is using IDS_ for all its command ids. This is because views cannot depend
1067 // on IDC_ for now. 1071 // on IDC_ for now.
1068 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES, 1072 menu_contents->AddItemWithStringId(IDC_EDIT_SEARCH_ENGINES,
1069 IDS_EDIT_SEARCH_ENGINES); 1073 IDS_EDIT_SEARCH_ENGINES);
1070 } 1074 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698