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

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

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 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 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/prefs/pref_service.h" 10 #include "base/prefs/pref_service.h"
(...skipping 165 matching lines...) Expand 10 before | Expand all | Expand 10 after
176 } 176 }
177 177
178 GURL LocationBarViewMac::GetDestinationURL() const { 178 GURL LocationBarViewMac::GetDestinationURL() const {
179 return destination_url(); 179 return destination_url();
180 } 180 }
181 181
182 WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const { 182 WindowOpenDisposition LocationBarViewMac::GetWindowOpenDisposition() const {
183 return disposition(); 183 return disposition();
184 } 184 }
185 185
186 content::PageTransition LocationBarViewMac::GetPageTransition() const { 186 ui::PageTransition LocationBarViewMac::GetPageTransition() const {
187 return transition(); 187 return transition();
188 } 188 }
189 189
190 void LocationBarViewMac::AcceptInput() { 190 void LocationBarViewMac::AcceptInput() {
191 WindowOpenDisposition disposition = 191 WindowOpenDisposition disposition =
192 ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]); 192 ui::WindowOpenDispositionFromNSEvent([NSApp currentEvent]);
193 omnibox_view_->model()->AcceptInput(disposition, false); 193 omnibox_view_->model()->AcceptInput(disposition, false);
194 } 194 }
195 195
196 void LocationBarViewMac::FocusLocation(bool select_all) { 196 void LocationBarViewMac::FocusLocation(bool select_all) {
(...skipping 568 matching lines...) Expand 10 before | Expand all | Expand 10 after
765 } 765 }
766 766
767 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() { 767 bool LocationBarViewMac::UpdateMicSearchDecorationVisibility() {
768 bool is_visible = !GetToolbarModel()->input_in_progress() && 768 bool is_visible = !GetToolbarModel()->input_in_progress() &&
769 browser_->search_model()->voice_search_supported(); 769 browser_->search_model()->voice_search_supported();
770 if (mic_search_decoration_->IsVisible() == is_visible) 770 if (mic_search_decoration_->IsVisible() == is_visible)
771 return false; 771 return false;
772 mic_search_decoration_->SetVisible(is_visible); 772 mic_search_decoration_->SetVisible(is_visible);
773 return true; 773 return true;
774 } 774 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698