Upstream version 10.39.225.0

[platform/framework/web/crosswalk.git] / src / content / public / browser / web_ui.h

diff --git a/src/content/public/browser/web_ui.h b/src/content/public/browser/web_ui.h
index 9d13240..8568530 100644 (file)
--- a/src/content/public/browser/web_ui.h
+++ b/src/content/public/browser/web_ui.h
@@ -11,8 +11,7 @@
 #include "base/callback.h"
 #include "base/strings/string16.h"
 #include "content/common/content_export.h"
-#include "content/public/common/page_transition_types.h"
-#include "ui/base/layout.h"
+#include "ui/base/page_transition_types.h"
 
 class GURL;
 
@@ -55,7 +54,7 @@ class CONTENT_EXPORT WebUI {
   // Returns the device scale factor of the monitor that the renderer is on.
   // Whenever possible, WebUI should push resources with this scale factor to
   // Javascript.
-  virtual ui::ScaleFactor GetDeviceScaleFactor() const = 0;
+  virtual float GetDeviceScaleFactor() const = 0;
 
   // Gets a custom tab title provided by the Web UI. If there is no title
   // override, the string will be empty which should trigger the default title
@@ -65,8 +64,8 @@ class CONTENT_EXPORT WebUI {
 
   // Returns the transition type that should be used for link clicks on this
   // Web UI. This will default to LINK but may be overridden.
-  virtual PageTransition GetLinkTransitionType() const = 0;
-  virtual void SetLinkTransitionType(PageTransition type) = 0;
+  virtual ui::PageTransition GetLinkTransitionType() const = 0;
+  virtual void SetLinkTransitionType(ui::PageTransition type) = 0;
 
   // Allows a controller to override the BindingsPolicy that should be enabled
   // for this page.