diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-06 15:32:27 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-06 15:32:27 +0000 |
| commit | 4d241a59c82631b6df9147509faef9ff6ed198f1 (patch) | |
| tree | d42991ea7da7147dd704e8b2ea08995c3c0e8508 /chrome/browser/ui/webui/conflicts_ui.h | |
| parent | 3f05f9de010f7a09748477792719ed831fa584a1 (diff) | |
| download | chromium_src-4d241a59c82631b6df9147509faef9ff6ed198f1.zip chromium_src-4d241a59c82631b6df9147509faef9ff6ed198f1.tar.gz chromium_src-4d241a59c82631b6df9147509faef9ff6ed198f1.tar.bz2 | |
Removes force_bookmark_bar_visible_ from WebUI and puts it in
ChromeWebUI. All chrome WebUI classes now extend ChromeWebUI.
BUG=none
TEST=none
R=estade@chromium.org
Review URL: http://codereview.chromium.org/7111016
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@87987 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/ui/webui/conflicts_ui.h')
| -rw-r--r-- | chrome/browser/ui/webui/conflicts_ui.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/conflicts_ui.h b/chrome/browser/ui/webui/conflicts_ui.h index 3e05ccf..a3a39e0 100644 --- a/chrome/browser/ui/webui/conflicts_ui.h +++ b/chrome/browser/ui/webui/conflicts_ui.h @@ -6,14 +6,14 @@ #define CHROME_BROWSER_UI_WEBUI_CONFLICTS_UI_H_ #pragma once -#include "content/browser/webui/web_ui.h" +#include "chrome/browser/ui/webui/chrome_web_ui.h" #if defined(OS_WIN) class RefCountedMemory; // The Web UI handler for about:conflicts. -class ConflictsUI : public WebUI { +class ConflictsUI : public ChromeWebUI { public: explicit ConflictsUI(TabContents* contents); |