| OLD | NEW |
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" | 5 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h" |
| 6 | 6 |
| 7 #include "base/bind.h" | 7 #include "base/bind.h" |
| 8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
| 9 #import "base/mac/mac_util.h" | 9 #import "base/mac/mac_util.h" |
| 10 #include "base/stl_util.h" | 10 #include "base/stl_util.h" |
| (...skipping 625 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 636 const int resource_id = omnibox_view_->GetIcon(); | 636 const int resource_id = omnibox_view_->GetIcon(); |
| 637 NSImage* image = OmniboxViewMac::ImageForResource(resource_id); | 637 NSImage* image = OmniboxViewMac::ImageForResource(resource_id); |
| 638 location_icon_decoration_->SetImage(image); | 638 location_icon_decoration_->SetImage(image); |
| 639 ev_bubble_decoration_->SetImage(image); | 639 ev_bubble_decoration_->SetImage(image); |
| 640 Layout(); | 640 Layout(); |
| 641 return; | 641 return; |
| 642 } | 642 } |
| 643 UpdateLocationIcon(); | 643 UpdateLocationIcon(); |
| 644 } | 644 } |
| 645 | 645 |
| 646 void LocationBarViewMac::ShowURL() { | |
| 647 omnibox_view_->ShowURL(); | |
| 648 } | |
| 649 | |
| 650 ToolbarModel* LocationBarViewMac::GetToolbarModel() { | 646 ToolbarModel* LocationBarViewMac::GetToolbarModel() { |
| 651 return browser_->toolbar_model(); | 647 return browser_->toolbar_model(); |
| 652 } | 648 } |
| 653 | 649 |
| 654 const ToolbarModel* LocationBarViewMac::GetToolbarModel() const { | 650 const ToolbarModel* LocationBarViewMac::GetToolbarModel() const { |
| 655 return browser_->toolbar_model(); | 651 return browser_->toolbar_model(); |
| 656 } | 652 } |
| 657 | 653 |
| 658 WebContents* LocationBarViewMac::GetWebContents() { | 654 WebContents* LocationBarViewMac::GetWebContents() { |
| 659 return browser_->tab_strip_model()->GetActiveWebContents(); | 655 return browser_->tab_strip_model()->GetActiveWebContents(); |
| (...skipping 193 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 853 OnDecorationsChanged(); | 849 OnDecorationsChanged(); |
| 854 } | 850 } |
| 855 | 851 |
| 856 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() { | 852 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() { |
| 857 std::vector<LocationBarDecoration*> decorations = GetDecorations(); | 853 std::vector<LocationBarDecoration*> decorations = GetDecorations(); |
| 858 std::vector<NSView*> views; | 854 std::vector<NSView*> views; |
| 859 for (auto* decoration : decorations) | 855 for (auto* decoration : decorations) |
| 860 views.push_back(decoration->GetAccessibilityView()); | 856 views.push_back(decoration->GetAccessibilityView()); |
| 861 return views; | 857 return views; |
| 862 } | 858 } |
| OLD | NEW |