summaryrefslogtreecommitdiffstats
path: root/content/browser/webui
diff options
context:
space:
mode:
authorjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-12 20:29:04 +0000
committerjam@chromium.org <jam@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-04-12 20:29:04 +0000
commitc744f7d2acf1b35e531860bf655714dc901d148f (patch)
tree2a8a253ec0c4c392df66e7543d504588e0984a87 /content/browser/webui
parenta3eb0a237280b3942288f82fcb7174c1283bf9ee (diff)
downloadchromium_src-c744f7d2acf1b35e531860bf655714dc901d148f.zip
chromium_src-c744f7d2acf1b35e531860bf655714dc901d148f.tar.gz
chromium_src-c744f7d2acf1b35e531860bf655714dc901d148f.tar.bz2
Remove some chrome-specific methods from content::WebUI.
HideFavicon wasn't used anymore. This is probably because now we show a search icon there. FocusLocationBarByDefault can just be implemented in Browser (like Instant). HideURL can just be implemented in ToolbarModelImpl (again, like Instant). Review URL: https://codereview.chromium.org/14080004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@193998 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/browser/webui')
-rw-r--r--content/browser/webui/web_ui_impl.cc29
-rw-r--r--content/browser/webui/web_ui_impl.h9
2 files changed, 1 insertions, 37 deletions
diff --git a/content/browser/webui/web_ui_impl.cc b/content/browser/webui/web_ui_impl.cc
index 5155702..88b181b 100644
--- a/content/browser/webui/web_ui_impl.cc
+++ b/content/browser/webui/web_ui_impl.cc
@@ -45,10 +45,7 @@ string16 WebUI::GetJavascriptCall(
}
WebUIImpl::WebUIImpl(WebContents* contents)
- : hide_favicon_(false),
- focus_location_bar_by_default_(false),
- should_hide_url_(false),
- link_transition_type_(PAGE_TRANSITION_LINK),
+ : link_transition_type_(PAGE_TRANSITION_LINK),
bindings_(BINDINGS_POLICY_WEB_UI),
web_contents_(contents) {
DCHECK(contents);
@@ -111,30 +108,6 @@ ui::ScaleFactor WebUIImpl::GetDeviceScaleFactor() const {
return GetScaleFactorForView(web_contents_->GetRenderWidgetHostView());
}
-bool WebUIImpl::ShouldHideFavicon() const {
- return hide_favicon_;
-}
-
-void WebUIImpl::HideFavicon() {
- hide_favicon_ = true;
-}
-
-bool WebUIImpl::ShouldFocusLocationBarByDefault() const {
- return focus_location_bar_by_default_;
-}
-
-void WebUIImpl::FocusLocationBarByDefault() {
- focus_location_bar_by_default_ = true;
-}
-
-bool WebUIImpl::ShouldHideURL() const {
- return should_hide_url_;
-}
-
-void WebUIImpl::HideURL() {
- should_hide_url_ = true;
-}
-
const string16& WebUIImpl::GetOverriddenTitle() const {
return overridden_title_;
}
diff --git a/content/browser/webui/web_ui_impl.h b/content/browser/webui/web_ui_impl.h
index 49d9b4b..1be3674 100644
--- a/content/browser/webui/web_ui_impl.h
+++ b/content/browser/webui/web_ui_impl.h
@@ -32,12 +32,6 @@ class CONTENT_EXPORT WebUIImpl : public WebUI,
virtual WebUIController* GetController() const OVERRIDE;
virtual void SetController(WebUIController* controller) OVERRIDE;
virtual ui::ScaleFactor GetDeviceScaleFactor() const OVERRIDE;
- virtual bool ShouldHideFavicon() const OVERRIDE;
- virtual void HideFavicon() OVERRIDE;
- virtual bool ShouldFocusLocationBarByDefault() const OVERRIDE;
- virtual void FocusLocationBarByDefault() OVERRIDE;
- virtual bool ShouldHideURL() const OVERRIDE;
- virtual void HideURL() OVERRIDE;
virtual const string16& GetOverriddenTitle() const OVERRIDE;
virtual void OverrideTitle(const string16& title) OVERRIDE;
virtual PageTransition GetLinkTransitionType() const OVERRIDE;
@@ -91,9 +85,6 @@ 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.
- bool hide_favicon_;
- bool focus_location_bar_by_default_;
- bool should_hide_url_;
string16 overridden_title_; // Defaults to empty string.
PageTransition link_transition_type_; // Defaults to LINK.
int bindings_; // The bindings from BindingsPolicy that should be enabled for