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

Unified Diff: chrome/browser/instant/instant_controller.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/infobars/infobar_delegate.cc ('k') | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_controller.h
===================================================================
--- chrome/browser/instant/instant_controller.h (revision 105162)
+++ chrome/browser/instant/instant_controller.h (working copy)
@@ -18,7 +18,7 @@
#include "chrome/browser/instant/instant_loader_delegate.h"
#include "chrome/browser/search_engines/template_url_id.h"
#include "chrome/common/instant_types.h"
-#include "content/common/page_transition_types.h"
+#include "content/public/common/page_transition_types.h"
#include "googleurl/src/gurl.h"
#include "ui/gfx/native_widget_types.h"
#include "ui/gfx/rect.h"
@@ -150,7 +150,7 @@
bool is_displayable() const { return is_displayable_; }
// Returns the transition type of the last AutocompleteMatch passed to Update.
- PageTransition::Type last_transition_type() const {
+ content::PageTransition last_transition_type() const {
return last_transition_type_;
}
@@ -180,7 +180,7 @@
// internally from Update.
void UpdateLoader(const TemplateURL* template_url,
const GURL& url,
- PageTransition::Type transition_type,
+ content::PageTransition transition_type,
const string16& user_text,
bool verbatim,
string16* suggested_text);
@@ -232,7 +232,7 @@
bool commit_on_mouse_up_;
// See description above getter.
- PageTransition::Type last_transition_type_;
+ content::PageTransition last_transition_type_;
// The IDs of any search engines that don't support instant. We assume all
// search engines support instant, but if we determine an engine doesn't
« no previous file with comments | « chrome/browser/infobars/infobar_delegate.cc ('k') | chrome/browser/instant/instant_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698