| Index: chrome/browser/ui/views/location_bar/location_bar_view.cc
|
| ===================================================================
|
| --- chrome/browser/ui/views/location_bar/location_bar_view.cc (revision 105162)
|
| +++ chrome/browser/ui/views/location_bar/location_bar_view.cc (working copy)
|
| @@ -118,7 +118,9 @@
|
| model_(model),
|
| delegate_(delegate),
|
| disposition_(CURRENT_TAB),
|
| - transition_(PageTransition::TYPED | PageTransition::FROM_ADDRESS_BAR),
|
| + transition_(content::PageTransitionFromInt(
|
| + content::PAGE_TRANSITION_TYPED |
|
| + content::PAGE_TRANSITION_FROM_ADDRESS_BAR)),
|
| location_icon_view_(NULL),
|
| ev_bubble_view_(NULL),
|
| location_entry_view_(NULL),
|
| @@ -824,14 +826,15 @@
|
| void LocationBarView::OnAutocompleteAccept(
|
| const GURL& url,
|
| WindowOpenDisposition disposition,
|
| - PageTransition::Type transition,
|
| + 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_ = content::PageTransitionFromInt(
|
| + transition | content::PAGE_TRANSITION_FROM_ADDRESS_BAR);
|
|
|
| if (browser_->command_updater()) {
|
| if (!alternate_nav_url.is_valid()) {
|
| @@ -1156,7 +1159,7 @@
|
| return disposition_;
|
| }
|
|
|
| -PageTransition::Type LocationBarView::GetPageTransition() const {
|
| +content::PageTransition LocationBarView::GetPageTransition() const {
|
| return transition_;
|
| }
|
|
|
|
|