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

Side by Side Diff: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm

Issue 2256613002: Remove ShowURL/HideURL from OmniboxView and LocationBarView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_search_terms
Patch Set: rebase Created 4 years, 3 months 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
OLDNEW
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 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
656 const int resource_id = omnibox_view_->GetIcon(); 656 const int resource_id = omnibox_view_->GetIcon();
657 NSImage* image = OmniboxViewMac::ImageForResource(resource_id); 657 NSImage* image = OmniboxViewMac::ImageForResource(resource_id);
658 location_icon_decoration_->SetImage(image); 658 location_icon_decoration_->SetImage(image);
659 security_state_bubble_decoration_->SetImage(image); 659 security_state_bubble_decoration_->SetImage(image);
660 Layout(); 660 Layout();
661 return; 661 return;
662 } 662 }
663 UpdateLocationIcon(); 663 UpdateLocationIcon();
664 } 664 }
665 665
666 void LocationBarViewMac::ShowURL() {
667 omnibox_view_->ShowURL();
668 }
669
670 ToolbarModel* LocationBarViewMac::GetToolbarModel() { 666 ToolbarModel* LocationBarViewMac::GetToolbarModel() {
671 return browser_->toolbar_model(); 667 return browser_->toolbar_model();
672 } 668 }
673 669
674 const ToolbarModel* LocationBarViewMac::GetToolbarModel() const { 670 const ToolbarModel* LocationBarViewMac::GetToolbarModel() const {
675 return browser_->toolbar_model(); 671 return browser_->toolbar_model();
676 } 672 }
677 673
678 WebContents* LocationBarViewMac::GetWebContents() { 674 WebContents* LocationBarViewMac::GetWebContents() {
679 return browser_->tab_strip_model()->GetActiveWebContents(); 675 return browser_->tab_strip_model()->GetActiveWebContents();
(...skipping 253 matching lines...) Expand 10 before | Expand all | Expand 10 after
933 OnDecorationsChanged(); 929 OnDecorationsChanged();
934 } 930 }
935 931
936 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() { 932 std::vector<NSView*> LocationBarViewMac::GetDecorationAccessibilityViews() {
937 std::vector<LocationBarDecoration*> decorations = GetDecorations(); 933 std::vector<LocationBarDecoration*> decorations = GetDecorations();
938 std::vector<NSView*> views; 934 std::vector<NSView*> views;
939 for (auto* decoration : decorations) 935 for (auto* decoration : decorations)
940 views.push_back(decoration->GetAccessibilityView()); 936 views.push_back(decoration->GetAccessibilityView());
941 return views; 937 return views;
942 } 938 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698