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

Unified Diff: chrome/browser/ui/input_window_dialog_linux.cc

Issue 8438037: Change 'Add Page' to show a simple input dialog with --use-more-webui. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 years, 1 month 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
Index: chrome/browser/ui/input_window_dialog_linux.cc
diff --git a/chrome/browser/ui/input_window_dialog_linux.cc b/chrome/browser/ui/input_window_dialog_linux.cc
index 3ac9010e7eacdb109aa0fe0170bec430ad43b540..dfa4398a833a2076ce5f1af375bd75999fc6b357 100644
--- a/chrome/browser/ui/input_window_dialog_linux.cc
+++ b/chrome/browser/ui/input_window_dialog_linux.cc
@@ -12,24 +12,29 @@
#include "chrome/browser/ui/input_window_dialog_gtk.h"
#endif
-InputWindowDialog* InputWindowDialog::Create(gfx::NativeWindow parent,
- const string16& window_title,
- const string16& label,
- const string16& contents,
- Delegate* delegate,
- ButtonType type) {
+InputWindowDialog* InputWindowDialog::Create(
+ gfx::NativeWindow parent,
+ const string16& window_title,
+ const LabelContentsPairs& label_contents_pairs,
+ Delegate* delegate,
+ ButtonType type) {
#if defined(USE_AURA)
// TODO(tfarina): Implement ButtonType into WebUI dialog too.
- return new InputWindowDialogWebUI(window_title, label, contents, delegate);
+ return new InputWindowDialogWebUI(window_title,
+ label_contents_pairs,
+ delegate);
#else
if (ChromeWebUI::IsMoreWebUI()) {
// TODO(tfarina): Implement ButtonType into WebUI dialog too.
- return new InputWindowDialogWebUI(window_title, label, contents, delegate);
+ return new InputWindowDialogWebUI(window_title,
+ label_contents_pairs,
+ delegate);
} else {
+ DCHECK_EQ(1U, label_contents_pairs.size());
return new InputWindowDialogGtk(parent,
UTF16ToUTF8(window_title),
- UTF16ToUTF8(label),
- UTF16ToUTF8(contents),
+ UTF16ToUTF8(label_contents_pairs[0].first),
+ UTF16ToUTF8(label_contents_pairs[0].second),
delegate,
type);
}

Powered by Google App Engine
This is Rietveld 408576698