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

Unified Diff: chrome/browser/instant/instant_loader.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/instant/instant_controller.cc ('k') | chrome/browser/instant/instant_loader.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_loader.h
===================================================================
--- chrome/browser/instant/instant_loader.h (revision 105162)
+++ chrome/browser/instant/instant_loader.h (working copy)
@@ -15,7 +15,7 @@
#include "chrome/common/instant_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 "googleurl/src/gurl.h"
#include "ui/gfx/rect.h"
@@ -50,7 +50,7 @@
bool Update(TabContentsWrapper* tab_contents,
const TemplateURL* template_url,
const GURL& url,
- PageTransition::Type transition_type,
+ content::PageTransition transition_type,
const string16& user_text,
bool verbatim,
string16* suggested_text);
@@ -180,7 +180,7 @@
// Creates and loads the |template_url|'s instant URL.
void LoadInstantURL(TabContentsWrapper* tab_contents,
const TemplateURL* template_url,
- PageTransition::Type transition_type,
+ content::PageTransition transition_type,
const string16& user_text,
bool verbatim);
@@ -224,7 +224,7 @@
scoped_ptr<FrameLoadObserver> frame_load_observer_;
// Transition type of the match last passed to Update.
- PageTransition::Type last_transition_type_;
+ content::PageTransition last_transition_type_;
// Timer used to update the bounds of the omnibox.
base::OneShotTimer<InstantLoader> update_bounds_timer_;
« no previous file with comments | « chrome/browser/instant/instant_controller.cc ('k') | chrome/browser/instant/instant_loader.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698