| 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/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 235 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 246 } | 246 } |
| 247 } | 247 } |
| 248 | 248 |
| 249 void LocationBarView::Init() { | 249 void LocationBarView::Init() { |
| 250 // We need to be in a Widget, otherwise GetNativeTheme() may change and we're | 250 // We need to be in a Widget, otherwise GetNativeTheme() may change and we're |
| 251 // not prepared for that. | 251 // not prepared for that. |
| 252 DCHECK(GetWidget()); | 252 DCHECK(GetWidget()); |
| 253 | 253 |
| 254 const int kOmniboxPopupBorderImages[] = | 254 const int kOmniboxPopupBorderImages[] = |
| 255 IMAGE_GRID(IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW); | 255 IMAGE_GRID(IDR_OMNIBOX_POPUP_BORDER_AND_SHADOW); |
| 256 const int kOmniboxBorderImages[] = | 256 const int kOmniboxBorderImages[] = IMAGE_GRID(IDR_TEXTFIELD); |
| 257 IMAGE_GRID(IDR_OMNIBOX_BORDER_AND_SHADOW); | |
| 258 border_painter_.reset(views::Painter::CreateImageGridPainter( | 257 border_painter_.reset(views::Painter::CreateImageGridPainter( |
| 259 is_popup_mode_ ? kOmniboxPopupBorderImages : kOmniboxBorderImages)); | 258 is_popup_mode_ ? kOmniboxPopupBorderImages : kOmniboxBorderImages)); |
| 260 | 259 |
| 261 location_icon_view_ = new LocationIconView(this); | 260 location_icon_view_ = new LocationIconView(this); |
| 262 location_icon_view_->set_drag_controller(this); | 261 location_icon_view_->set_drag_controller(this); |
| 263 AddChildView(location_icon_view_); | 262 AddChildView(location_icon_view_); |
| 264 | 263 |
| 265 // Determine the main font. | 264 // Determine the main font. |
| 266 gfx::FontList font_list = ResourceBundle::GetSharedInstance().GetFontList( | 265 gfx::FontList font_list = ResourceBundle::GetSharedInstance().GetFontList( |
| 267 ResourceBundle::BaseFont); | 266 ResourceBundle::BaseFont); |
| (...skipping 1281 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1549 if (!browser) | 1548 if (!browser) |
| 1550 return; // Possible when browser is shutting down. | 1549 return; // Possible when browser is shutting down. |
| 1551 | 1550 |
| 1552 FirstRunBubble::ShowBubble(browser, GetLocationBarAnchor()); | 1551 FirstRunBubble::ShowBubble(browser, GetLocationBarAnchor()); |
| 1553 #endif | 1552 #endif |
| 1554 } | 1553 } |
| 1555 | 1554 |
| 1556 void LocationBarView::AccessibilitySetValue(const base::string16& new_value) { | 1555 void LocationBarView::AccessibilitySetValue(const base::string16& new_value) { |
| 1557 omnibox_view_->SetUserText(new_value, new_value, true); | 1556 omnibox_view_->SetUserText(new_value, new_value, true); |
| 1558 } | 1557 } |
| OLD | NEW |