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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.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 | « no previous file | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('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/location_bar/location_bar_view.h" 5 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <map> 8 #include <map>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 229 matching lines...) Expand 10 before | Expand all | Expand 10 after
240 240
241 const SkColor background_color = GetColor(BACKGROUND); 241 const SkColor background_color = GetColor(BACKGROUND);
242 location_icon_view_ = new LocationIconView(font_list, this); 242 location_icon_view_ = new LocationIconView(font_list, this);
243 location_icon_view_->set_drag_controller(this); 243 location_icon_view_->set_drag_controller(this);
244 AddChildView(location_icon_view_); 244 AddChildView(location_icon_view_);
245 245
246 // Initialize the Omnibox view. 246 // Initialize the Omnibox view.
247 omnibox_view_ = new OmniboxViewViews( 247 omnibox_view_ = new OmniboxViewViews(
248 this, profile(), command_updater(), is_popup_mode_, this, font_list); 248 this, profile(), command_updater(), is_popup_mode_, this, font_list);
249 omnibox_view_->Init(); 249 omnibox_view_->Init();
250 omnibox_view_->SetFocusBehavior(FocusBehavior::ALWAYS);
251 AddChildView(omnibox_view_); 250 AddChildView(omnibox_view_);
252 251
253 // Initialize the inline autocomplete view which is visible only when IME is 252 // Initialize the inline autocomplete view which is visible only when IME is
254 // turned on. Use the same font with the omnibox and highlighted background. 253 // turned on. Use the same font with the omnibox and highlighted background.
255 ime_inline_autocomplete_view_ = new views::Label(base::string16(), font_list); 254 ime_inline_autocomplete_view_ = new views::Label(base::string16(), font_list);
256 ime_inline_autocomplete_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT); 255 ime_inline_autocomplete_view_->SetHorizontalAlignment(gfx::ALIGN_LEFT);
257 ime_inline_autocomplete_view_->SetAutoColorReadabilityEnabled(false); 256 ime_inline_autocomplete_view_->SetAutoColorReadabilityEnabled(false);
258 ime_inline_autocomplete_view_->set_background( 257 ime_inline_autocomplete_view_->set_background(
259 views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor( 258 views::Background::CreateSolidBackground(GetNativeTheme()->GetSystemColor(
260 ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused))); 259 ui::NativeTheme::kColorId_TextfieldSelectionBackgroundFocused)));
(...skipping 1001 matching lines...) Expand 10 before | Expand all | Expand 10 after
1262 // LocationBarView, private TemplateURLServiceObserver implementation: 1261 // LocationBarView, private TemplateURLServiceObserver implementation:
1263 1262
1264 void LocationBarView::OnTemplateURLServiceChanged() { 1263 void LocationBarView::OnTemplateURLServiceChanged() {
1265 template_url_service_->RemoveObserver(this); 1264 template_url_service_->RemoveObserver(this);
1266 template_url_service_ = nullptr; 1265 template_url_service_ = nullptr;
1267 // If the browser is no longer active, let's not show the info bubble, as this 1266 // If the browser is no longer active, let's not show the info bubble, as this
1268 // would make the browser the active window again. 1267 // would make the browser the active window again.
1269 if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive()) 1268 if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
1270 ShowFirstRunBubble(); 1269 ShowFirstRunBubble();
1271 } 1270 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/omnibox/omnibox_view_views.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698