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

Unified Diff: chrome/browser/instant/instant_controller.cc

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.h ('k') | chrome/browser/instant/instant_loader.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_controller.cc
===================================================================
--- chrome/browser/instant/instant_controller.cc (revision 105162)
+++ chrome/browser/instant/instant_controller.cc (working copy)
@@ -42,7 +42,7 @@
is_active_(false),
is_displayable_(false),
commit_on_mouse_up_(false),
- last_transition_type_(PageTransition::LINK),
+ last_transition_type_(content::PAGE_TRANSITION_LINK),
ALLOW_THIS_IN_INITIALIZER_LIST(destroy_factory_(this)) {
PrefService* service = profile->GetPrefs();
if (service &&
@@ -447,7 +447,7 @@
void InstantController::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) {
« no previous file with comments | « chrome/browser/instant/instant_controller.h ('k') | chrome/browser/instant/instant_loader.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698