| Index: content/browser/webui/web_ui_impl.h
|
| diff --git a/content/browser/webui/web_ui_impl.h b/content/browser/webui/web_ui_impl.h
|
| index 40cb559c1f6470b83c20f872bd3aa793bbc0b3b1..8dad9d97e4b69ce9f11610d73b6f2a1c20f35d9e 100644
|
| --- a/content/browser/webui/web_ui_impl.h
|
| +++ b/content/browser/webui/web_ui_impl.h
|
| @@ -37,8 +37,8 @@ class CONTENT_EXPORT WebUIImpl : public WebUI,
|
| virtual float GetDeviceScaleFactor() const OVERRIDE;
|
| virtual const base::string16& GetOverriddenTitle() const OVERRIDE;
|
| virtual void OverrideTitle(const base::string16& title) OVERRIDE;
|
| - virtual PageTransition GetLinkTransitionType() const OVERRIDE;
|
| - virtual void SetLinkTransitionType(PageTransition type) OVERRIDE;
|
| + virtual ui::PageTransition GetLinkTransitionType() const OVERRIDE;
|
| + virtual void SetLinkTransitionType(ui::PageTransition type) OVERRIDE;
|
| virtual int GetBindings() const OVERRIDE;
|
| virtual void SetBindings(int bindings) OVERRIDE;
|
| virtual void OverrideJavaScriptFrame(const std::string& frame_name) OVERRIDE;
|
| @@ -99,7 +99,7 @@ class CONTENT_EXPORT WebUIImpl : public WebUI,
|
| // Options that may be overridden by individual Web UI implementations. The
|
| // bool options default to false. See the public getters for more information.
|
| base::string16 overridden_title_; // Defaults to empty string.
|
| - PageTransition link_transition_type_; // Defaults to LINK.
|
| + ui::PageTransition link_transition_type_; // Defaults to LINK.
|
| int bindings_; // The bindings from BindingsPolicy that should be enabled for
|
| // this page.
|
|
|
|
|