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

Unified Diff: chrome/browser/ui/omnibox/omnibox_edit_controller.h

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 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
Index: chrome/browser/ui/omnibox/omnibox_edit_controller.h
diff --git a/chrome/browser/ui/omnibox/omnibox_edit_controller.h b/chrome/browser/ui/omnibox/omnibox_edit_controller.h
index 5ec29f4bcda1afba60a3adea16cde9c8217d7e81..f1e849f0275447afa069bf906bb156f0e7672af3 100644
--- a/chrome/browser/ui/omnibox/omnibox_edit_controller.h
+++ b/chrome/browser/ui/omnibox/omnibox_edit_controller.h
@@ -6,7 +6,7 @@
#define CHROME_BROWSER_UI_OMNIBOX_OMNIBOX_EDIT_CONTROLLER_H_
#include "base/strings/string16.h"
-#include "content/public/common/page_transition_types.h"
+#include "ui/base/page_transition_types.h"
#include "ui/base/window_open_disposition.h"
#include "url/gurl.h"
@@ -30,7 +30,7 @@ class OmniboxEditController {
public:
void OnAutocompleteAccept(const GURL& destination_url,
WindowOpenDisposition disposition,
- content::PageTransition transition);
+ ui::PageTransition transition);
// Updates the controller, and, if |contents| is non-NULL, restores saved
// state that the tab holds.
@@ -78,7 +78,7 @@ class OmniboxEditController {
CommandUpdater* command_updater() { return command_updater_; }
GURL destination_url() const { return destination_url_; }
WindowOpenDisposition disposition() const { return disposition_; }
- content::PageTransition transition() const { return transition_; }
+ ui::PageTransition transition() const { return transition_; }
private:
CommandUpdater* command_updater_;
@@ -86,7 +86,7 @@ class OmniboxEditController {
// The details necessary to open the user's desired omnibox match.
GURL destination_url_;
WindowOpenDisposition disposition_;
- content::PageTransition transition_;
+ ui::PageTransition transition_;
DISALLOW_COPY_AND_ASSIGN(OmniboxEditController);
};
« no previous file with comments | « chrome/browser/ui/omnibox/alternate_nav_infobar_delegate.cc ('k') | chrome/browser/ui/omnibox/omnibox_edit_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698