Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(179)

Unified Diff: chrome/browser/ui/views/dialog_stubs_gtk.cc

Issue 7828065: chromeos: Add WebUI implementation of form repost dialog. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merge. again. Created 9 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/repost_form_warning.html ('k') | chrome/browser/ui/webui/chrome_web_ui_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/ui/views/dialog_stubs_gtk.cc
diff --git a/chrome/browser/ui/views/dialog_stubs_gtk.cc b/chrome/browser/ui/views/dialog_stubs_gtk.cc
index bf0b5cb26b4597778d2efa4c2ada056b4772880b..8b95c9475e77629260161c51e27095448661ef75 100644
--- a/chrome/browser/ui/views/dialog_stubs_gtk.cc
+++ b/chrome/browser/ui/views/dialog_stubs_gtk.cc
@@ -8,18 +8,23 @@
#include <gtk/gtk.h>
#include "base/logging.h"
-#include "chrome/browser/ui/gtk/about_chrome_dialog.h"
-#include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
#include "chrome/browser/ui/gtk/edit_search_engine_dialog.h"
-#include "chrome/browser/ui/gtk/repost_form_warning_gtk.h"
-#include "chrome/browser/ui/gtk/task_manager_gtk.h"
#include "chrome/browser/ui/views/browser_dialogs.h"
#include "chrome/browser/ui/webui/collected_cookies_ui_delegate.h"
-#include "content/browser/tab_contents/tab_contents.h"
-#include "views/widget/widget.h"
+#include "ui/gfx/native_widget_types.h"
+
+#if !defined(WEBUI_TASK_MANAGER)
+#include "chrome/browser/ui/gtk/task_manager_gtk.h"
+#endif
+
+#if !defined(OS_CHROMEOS)
+#include "chrome/browser/ui/gtk/collected_cookies_gtk.h"
+#include "chrome/browser/ui/gtk/repost_form_warning_gtk.h"
+#endif
namespace browser {
+#if !defined(WEBUI_TASK_MANAGER)
void ShowTaskManager() {
TaskManagerGtk::Show(false);
}
@@ -27,6 +32,7 @@ void ShowTaskManager() {
void ShowBackgroundPages() {
TaskManagerGtk::Show(true);
}
+#endif
void EditSearchEngine(gfx::NativeWindow parent,
const TemplateURL* template_url,
@@ -35,6 +41,7 @@ void EditSearchEngine(gfx::NativeWindow parent,
new EditSearchEngineDialog(GTK_WINDOW(parent), template_url, NULL, profile);
}
+#if !defined(OS_CHROMEOS)
void ShowRepostFormWarningDialog(gfx::NativeWindow parent_window,
TabContents* tab_contents) {
new RepostFormWarningGtk(GTK_WINDOW(parent_window), tab_contents);
@@ -42,11 +49,8 @@ void ShowRepostFormWarningDialog(gfx::NativeWindow parent_window,
void ShowCollectedCookiesDialog(gfx::NativeWindow parent_window,
TabContentsWrapper* wrapper) {
-#if defined(OS_CHROMEOS)
- CollectedCookiesUIDelegate::Show(wrapper);
-#else
new CollectedCookiesGtk(GTK_WINDOW(parent_window), wrapper);
-#endif
}
+#endif
} // namespace browser
« no previous file with comments | « chrome/browser/resources/repost_form_warning.html ('k') | chrome/browser/ui/webui/chrome_web_ui_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698