| Index: chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm
|
| ===================================================================
|
| --- chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (revision 105162)
|
| +++ chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.mm (working copy)
|
| @@ -92,7 +92,8 @@
|
| profile_(profile),
|
| browser_(browser),
|
| toolbar_model_(toolbar_model),
|
| - transition_(PageTransition::TYPED | PageTransition::FROM_ADDRESS_BAR),
|
| + transition_(content::PAGE_TRANSITION_TYPED |
|
| + content::PAGE_TRANSITION_FROM_ADDRESS_BAR),
|
| weak_ptr_factory_(this) {
|
| for (size_t i = 0; i < CONTENT_SETTINGS_NUM_TYPES; ++i) {
|
| DCHECK_EQ(i, content_setting_decorations_.size());
|
| @@ -152,7 +153,7 @@
|
| return disposition_;
|
| }
|
|
|
| -PageTransition::Type LocationBarViewMac::GetPageTransition() const {
|
| +content::PageTransition LocationBarViewMac::GetPageTransition() const {
|
| return transition_;
|
| }
|
|
|
| @@ -218,16 +219,17 @@
|
| OnChanged();
|
| }
|
|
|
| -void LocationBarViewMac::OnAutocompleteAccept(const GURL& url,
|
| - WindowOpenDisposition disposition,
|
| - PageTransition::Type transition,
|
| - const GURL& alternate_nav_url) {
|
| +void LocationBarViewMac::OnAutocompleteAccept(
|
| + const GURL& url,
|
| + WindowOpenDisposition disposition,
|
| + content::PageTransition transition,
|
| + const GURL& alternate_nav_url) {
|
| // WARNING: don't add an early return here. The calls after the if must
|
| // happen.
|
| if (url.is_valid()) {
|
| location_input_ = UTF8ToUTF16(url.spec());
|
| disposition_ = disposition;
|
| - transition_ = transition | PageTransition::FROM_ADDRESS_BAR;
|
| + transition_ = transition | content::PAGE_TRANSITION_FROM_ADDRESS_BAR;
|
|
|
| if (command_updater_) {
|
| if (!alternate_nav_url.is_valid()) {
|
|
|