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

Unified Diff: chrome/browser/instant/instant_loader.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_loader.h ('k') | chrome/browser/metrics/metrics_log.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/instant/instant_loader.cc
===================================================================
--- chrome/browser/instant/instant_loader.cc (revision 105162)
+++ chrome/browser/instant/instant_loader.cc (working copy)
@@ -44,7 +44,6 @@
#include "content/common/notification_registrar.h"
#include "content/common/notification_service.h"
#include "content/common/notification_source.h"
-#include "content/common/page_transition_types.h"
#include "content/common/renderer_preferences.h"
#include "net/http/http_util.h"
#include "ui/base/l10n/l10n_util.h"
@@ -571,7 +570,7 @@
template_url_id_(id),
ready_(false),
http_status_ok_(true),
- last_transition_type_(PageTransition::LINK),
+ last_transition_type_(content::PAGE_TRANSITION_LINK),
verbatim_(false),
needs_reload_(false) {
}
@@ -587,7 +586,7 @@
bool InstantLoader::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) {
@@ -773,7 +772,7 @@
return;
CreatePreviewContents(tab_contents);
- LoadInstantURL(tab_contents, template_url, PageTransition::GENERATED,
+ LoadInstantURL(tab_contents, template_url, content::PAGE_TRANSITION_GENERATED,
string16(), true);
}
@@ -1024,7 +1023,7 @@
void InstantLoader::LoadInstantURL(TabContentsWrapper* tab_contents,
const TemplateURL* template_url,
- PageTransition::Type transition_type,
+ content::PageTransition transition_type,
const string16& user_text,
bool verbatim) {
preview_tab_contents_delegate_->PrepareForNewLoad();
« no previous file with comments | « chrome/browser/instant/instant_loader.h ('k') | chrome/browser/metrics/metrics_log.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698