aura: Get rid of some unneeded stubs.
Most of these are for dialogs that already had WebUI
implementations.
BUG=99718
TEST=built with use_aura=1
Review URL: http://codereview.chromium.org/8218027
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@104937 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/chrome/browser/ui/login/login_prompt_ui.cc b/chrome/browser/ui/login/login_prompt_ui.cc
index 2708e89..460c11e 100644
--- a/chrome/browser/ui/login/login_prompt_ui.cc
+++ b/chrome/browser/ui/login/login_prompt_ui.cc
@@ -25,14 +25,6 @@
#include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/size.h"
-#if defined(USE_AURA) && !defined(OS_CHROMEOS) && !defined(TOUCH_UI)
-// TODO(saintlou): This is another big fat hack like in the FileSelector.
-namespace chrome {
-const char kChromeUIHttpAuthHost[] = "http-auth";
-const char kChromeUIHttpAuthURL[] = "chrome://http-auth/";
-} // namespace chrome
-#endif
-
class LoginHandlerSource : public ChromeURLDataManager::DataSource {
public:
LoginHandlerSource()
diff --git a/chrome/browser/ui/views/stubs_aura.cc b/chrome/browser/ui/views/stubs_aura.cc
index 455d057..f7d270fb 100644
--- a/chrome/browser/ui/views/stubs_aura.cc
+++ b/chrome/browser/ui/views/stubs_aura.cc
@@ -41,23 +41,6 @@
namespace browser {
-// Declared in browser_dialogs.h so others don't need to depend on our header.
-void ShowTaskManager() {
- // TODO(beng):
- NOTIMPLEMENTED();
-}
-
-void ShowBackgroundPages() {
- // TODO(beng):
- NOTIMPLEMENTED();
-}
-
-void ShowCollectedCookiesDialog(gfx::NativeWindow parent_window,
- TabContentsWrapper* tab_contents) {
- // TODO(beng):
- NOTIMPLEMENTED();
-}
-
void ShowSSLClientCertificateSelector(
TabContentsWrapper* parent,
net::SSLCertRequestInfo* cert_request_info,
@@ -71,23 +54,6 @@
NOTIMPLEMENTED();
}
-gfx::Rect GrabWindowSnapshot(gfx::NativeWindow window,
- std::vector<unsigned char>* png_representation) {
- // TODO(beng):
- NOTIMPLEMENTED();
- return gfx::Rect();
-}
-
-void ShowHungRendererDialog(TabContents* contents) {
- // TODO(beng):
- NOTIMPLEMENTED();
-}
-
-void HideHungRendererDialog(TabContents* contents) {
- // TODO(beng):
- NOTIMPLEMENTED();
-}
-
#if defined(USE_NSS)
crypto::CryptoModuleBlockingPasswordDelegate*
NewCryptoModuleBlockingDialogDelegate(
@@ -109,17 +75,12 @@
NOTIMPLEMENTED();
}
-void ShowRepostFormWarningDialog(gfx::NativeWindow parent_window,
- TabContents* tab_contents) {
- // TODO(saintlou):
- NOTIMPLEMENTED();
-}
-
-void ShowCryptoModulePasswordDialog(const std::string& module_name,
- bool retry,
- CryptoModulePasswordReason reason,
- const std::string& server,
- const CryptoModulePasswordCallback& callback) {
+void ShowCryptoModulePasswordDialog(
+ const std::string& module_name,
+ bool retry,
+ CryptoModulePasswordReason reason,
+ const std::string& server,
+ const CryptoModulePasswordCallback& callback) {
// TODO(saintlou):
NOTIMPLEMENTED();
}
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 2d5768b..22038ab 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4142,6 +4142,12 @@
['exclude', '^browser/ui/window_snapshot/window_snapshot_win.cc'],
['include', '^browser/ui/views/simple_message_box_views.cc'],
['include', '^browser/ui/views/simple_message_box_views.h'],
+ ['include', '^browser/ui/webui/collected_cookies_ui_delegate.cc'],
+ ['include', '^browser/ui/webui/collected_cookies_ui_delegate.h'],
+ ['include', '^browser/ui/webui/cookies_tree_model_adapter.cc'],
+ ['include', '^browser/ui/webui/cookies_tree_model_adapter.h'],
+ ['include', '^browser/ui/webui/repost_form_warning_ui.cc'],
+ ['include', '^browser/ui/webui/repost_form_warning_ui.h'],
],
'dependencies': [
'../ui/aura_shell/aura_shell.gyp:aura_shell',
@@ -4182,7 +4188,7 @@
],
}],
],
- }],
+ }],
['OS=="linux" and use_aura==1', {
'dependencies': [
'../build/linux/system.gyp:dbus',
@@ -4190,7 +4196,7 @@
'../build/linux/system.gyp:x11',
'../dbus/dbus.gyp:dbus',
],
- }],
+ }],
# Exclude WebUI certificate viewer if not POSIX or mac (these OS's have
# native certificate viewers).
['os_posix == 0 or OS == "mac"', {
diff --git a/chrome/common/url_constants.cc b/chrome/common/url_constants.cc
index 8edf64e..b8f8b19 100644
--- a/chrome/common/url_constants.cc
+++ b/chrome/common/url_constants.cc
@@ -98,7 +98,7 @@
const char kChromeUIFileManagerURL[] = "chrome://files/";
#endif
-#if defined(OS_CHROMEOS) || defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) || defined(TOUCH_UI) || defined(USE_AURA)
const char kChromeUICollectedCookiesURL[] = "chrome://collected-cookies/";
const char kChromeUIHttpAuthURL[] = "chrome://http-auth/";
const char kChromeUIRepostFormWarningURL[] = "chrome://repost-form-warning/";
@@ -221,7 +221,7 @@
const char kChromeUIFileManagerHost[] = "files";
#endif
-#if defined(OS_CHROMEOS) || defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) || defined(TOUCH_UI) || defined(USE_AURA)
const char kChromeUICollectedCookiesHost[] = "collected-cookies";
const char kChromeUIHttpAuthHost[] = "http-auth";
const char kChromeUIRepostFormWarningHost[] = "repost-form-warning";
diff --git a/chrome/common/url_constants.h b/chrome/common/url_constants.h
index 9c6e2b130..aee1e9d 100644
--- a/chrome/common/url_constants.h
+++ b/chrome/common/url_constants.h
@@ -91,7 +91,7 @@
extern const char kChromeUIFileManagerURL[];
#endif
-#if defined(OS_CHROMEOS) || defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) || defined(TOUCH_UI) || defined(USE_AURA)
extern const char kChromeUICollectedCookiesURL[];
extern const char kChromeUIHttpAuthURL[];
extern const char kChromeUIRepostFormWarningURL[];
@@ -212,7 +212,7 @@
extern const char kChromeUIFileManagerHost[];
#endif
-#if defined(OS_CHROMEOS) || defined(TOUCH_UI)
+#if defined(OS_CHROMEOS) || defined(TOUCH_UI) || defined(USE_AURA)
extern const char kChromeUICollectedCookiesHost[];
extern const char kChromeUIHttpAuthHost[];
extern const char kChromeUIRepostFormWarningHost[];
