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

Unified Diff: chrome/browser/ui/gtk/location_bar_view_gtk.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
« no previous file with comments | « chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/gtk/location_bar_view_gtk.h
===================================================================
--- chrome/browser/ui/gtk/location_bar_view_gtk.h (revision 105162)
+++ chrome/browser/ui/gtk/location_bar_view_gtk.h (working copy)
@@ -27,7 +27,7 @@
#include "chrome/common/content_settings_types.h"
#include "content/common/notification_observer.h"
#include "content/common/notification_registrar.h"
-#include "content/common/page_transition_types.h"
+#include "content/public/common/page_transition_types.h"
#include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/animation/animation_delegate.h"
#include "ui/base/animation/slide_animation.h"
@@ -96,7 +96,7 @@
// Implement the AutocompleteEditController interface.
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;
@@ -114,7 +114,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;
@@ -410,7 +410,7 @@
WindowOpenDisposition disposition_;
// The transition type to use for the navigation.
- PageTransition::Type transition_;
+ content::PageTransition transition_;
// Used to schedule a task for the first run bubble.
base::WeakPtrFactory<LocationBarViewGtk> first_run_bubble_;
« no previous file with comments | « chrome/browser/ui/gtk/instant_confirm_dialog_gtk.cc ('k') | chrome/browser/ui/gtk/location_bar_view_gtk.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698