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

Unified Diff: chrome/browser/ui/views/location_bar/location_bar_view.h

Issue 8253002: Move PageTransition into content namespace. While I'm touching all these files, I've also updated... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 2 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 side-by-side diff with in-line comments
Download patch
Index: chrome/browser/ui/views/location_bar/location_bar_view.h
===================================================================
--- chrome/browser/ui/views/location_bar/location_bar_view.h (revision 105162)
+++ chrome/browser/ui/views/location_bar/location_bar_view.h (working copy)
@@ -207,7 +207,7 @@
// AutocompleteEditController
virtual void OnAutocompleteAccept(const GURL& url,
WindowOpenDisposition disposition,
- PageTransition::Type transition,
+ content::PageTransition transition,
const GURL& alternate_nav_url) OVERRIDE;
virtual void OnChanged() OVERRIDE;
virtual void OnSelectionBoundsChanged() OVERRIDE;
@@ -241,7 +241,7 @@
InstantCompleteBehavior behavior) OVERRIDE;
virtual string16 GetInputString() const OVERRIDE;
virtual WindowOpenDisposition GetWindowOpenDisposition() const OVERRIDE;
- virtual PageTransition::Type GetPageTransition() const OVERRIDE;
+ virtual content::PageTransition GetPageTransition() const OVERRIDE;
virtual void AcceptInput() OVERRIDE;
virtual void FocusLocation(bool select_all) OVERRIDE;
virtual void FocusSearch() OVERRIDE;
@@ -361,7 +361,7 @@
WindowOpenDisposition disposition_;
// The transition type to use for the navigation
- PageTransition::Type transition_;
+ content::PageTransition transition_;
// Font used by edit and some of the hints.
gfx::Font font_;
« no previous file with comments | « chrome/browser/ui/views/instant_confirm_view.cc ('k') | chrome/browser/ui/views/location_bar/location_bar_view.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698