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

Side by Side Diff: chrome/browser/ui/views/location_bar/location_bar_view.cc

Issue 2256613002: Remove ShowURL/HideURL from OmniboxView and LocationBarView (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@remove_search_terms
Patch Set: Mac Created 4 years, 4 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 (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/i18n/rtl.h" 10 #include "base/i18n/rtl.h"
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 omnibox_view_->ResetTabState(contents); 809 omnibox_view_->ResetTabState(contents);
810 } 810 }
811 811
812 //////////////////////////////////////////////////////////////////////////////// 812 ////////////////////////////////////////////////////////////////////////////////
813 // LocationBarView, public OmniboxEditController implementation: 813 // LocationBarView, public OmniboxEditController implementation:
814 814
815 void LocationBarView::UpdateWithoutTabRestore() { 815 void LocationBarView::UpdateWithoutTabRestore() {
816 Update(nullptr); 816 Update(nullptr);
817 } 817 }
818 818
819 void LocationBarView::ShowURL() {
820 omnibox_view_->ShowURL();
821 }
822
823 ToolbarModel* LocationBarView::GetToolbarModel() { 819 ToolbarModel* LocationBarView::GetToolbarModel() {
824 return delegate_->GetToolbarModel(); 820 return delegate_->GetToolbarModel();
825 } 821 }
826 822
827 WebContents* LocationBarView::GetWebContents() { 823 WebContents* LocationBarView::GetWebContents() {
828 return delegate_->GetWebContents(); 824 return delegate_->GetWebContents();
829 } 825 }
830 826
831 //////////////////////////////////////////////////////////////////////////////// 827 ////////////////////////////////////////////////////////////////////////////////
832 // LocationBarView, private: 828 // LocationBarView, private:
(...skipping 552 matching lines...) Expand 10 before | Expand all | Expand 10 after
1385 // LocationBarView, private TemplateURLServiceObserver implementation: 1381 // LocationBarView, private TemplateURLServiceObserver implementation:
1386 1382
1387 void LocationBarView::OnTemplateURLServiceChanged() { 1383 void LocationBarView::OnTemplateURLServiceChanged() {
1388 template_url_service_->RemoveObserver(this); 1384 template_url_service_->RemoveObserver(this);
1389 template_url_service_ = nullptr; 1385 template_url_service_ = nullptr;
1390 // If the browser is no longer active, let's not show the info bubble, as this 1386 // If the browser is no longer active, let's not show the info bubble, as this
1391 // would make the browser the active window again. 1387 // would make the browser the active window again.
1392 if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive()) 1388 if (omnibox_view_ && omnibox_view_->GetWidget()->IsActive())
1393 ShowFirstRunBubble(); 1389 ShowFirstRunBubble();
1394 } 1390 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698