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

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

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 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 (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 1239 matching lines...) Expand 10 before | Expand all | Expand 10 after
1250 } 1250 }
1251 1251
1252 GURL LocationBarView::GetDestinationURL() const { 1252 GURL LocationBarView::GetDestinationURL() const {
1253 return destination_url(); 1253 return destination_url();
1254 } 1254 }
1255 1255
1256 WindowOpenDisposition LocationBarView::GetWindowOpenDisposition() const { 1256 WindowOpenDisposition LocationBarView::GetWindowOpenDisposition() const {
1257 return disposition(); 1257 return disposition();
1258 } 1258 }
1259 1259
1260 content::PageTransition LocationBarView::GetPageTransition() const { 1260 ui::PageTransition LocationBarView::GetPageTransition() const {
1261 return transition(); 1261 return transition();
1262 } 1262 }
1263 1263
1264 void LocationBarView::AcceptInput() { 1264 void LocationBarView::AcceptInput() {
1265 omnibox_view_->model()->AcceptInput(CURRENT_TAB, false); 1265 omnibox_view_->model()->AcceptInput(CURRENT_TAB, false);
1266 } 1266 }
1267 1267
1268 void LocationBarView::FocusSearch() { 1268 void LocationBarView::FocusSearch() {
1269 omnibox_view_->SetFocus(); 1269 omnibox_view_->SetFocus();
1270 omnibox_view_->SetForcedQuery(); 1270 omnibox_view_->SetForcedQuery();
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
1657 1657
1658 void LocationBarView::ModelChanged(const SearchModel::State& old_state, 1658 void LocationBarView::ModelChanged(const SearchModel::State& old_state,
1659 const SearchModel::State& new_state) { 1659 const SearchModel::State& new_state) {
1660 const bool visible = !GetToolbarModel()->input_in_progress() && 1660 const bool visible = !GetToolbarModel()->input_in_progress() &&
1661 new_state.voice_search_supported; 1661 new_state.voice_search_supported;
1662 if (mic_search_view_->visible() != visible) { 1662 if (mic_search_view_->visible() != visible) {
1663 mic_search_view_->SetVisible(visible); 1663 mic_search_view_->SetVisible(visible);
1664 Layout(); 1664 Layout();
1665 } 1665 }
1666 } 1666 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/location_bar/location_bar_view.h ('k') | chrome/browser/ui/views/location_bar/zoom_bubble_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698