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

Unified Diff: chrome/test/base/test_location_bar.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/test/base/in_process_browser_test.cc ('k') | chrome/test/base/test_location_bar.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/test_location_bar.h
===================================================================
--- chrome/test/base/test_location_bar.h (revision 105162)
+++ chrome/test/base/test_location_bar.h (working copy)
@@ -9,7 +9,7 @@
#include "base/string16.h"
#include "chrome/browser/first_run/first_run.h"
#include "chrome/browser/ui/omnibox/location_bar.h"
-#include "content/common/page_transition_types.h"
+#include "content/public/common/page_transition_types.h"
#include "webkit/glue/window_open_disposition.h"
class TestLocationBar : public LocationBar {
@@ -23,7 +23,7 @@
void set_disposition(WindowOpenDisposition disposition) {
disposition_ = disposition;
}
- void set_transition(PageTransition::Type transition) {
+ void set_transition(content::PageTransition transition) {
transition_ = transition;
}
@@ -33,7 +33,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 {}
@@ -52,7 +52,7 @@
// interface.
string16 input_string_;
WindowOpenDisposition disposition_;
- PageTransition::Type transition_;
+ content::PageTransition transition_;
DISALLOW_COPY_AND_ASSIGN(TestLocationBar);
};
« no previous file with comments | « chrome/test/base/in_process_browser_test.cc ('k') | chrome/test/base/test_location_bar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698