Change 'Add Page' to show a simple input dialog with --use-more-webui.

chrome/browser/ui/input_window_dialog_win.cc

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/ui/input_window_dialog.h"
 
 #include "base/compiler_specific.h"
 #include "base/message_loop.h"
 #include "base/task.h"
 #include "base/utf_string_conversions.h"
@@ skipping 115 matching lines @@
 string16 ContentView::GetDialogButtonLabel(ui::DialogButton button) const {
   if (button == ui::DIALOG_BUTTON_OK) {
     return l10n_util::GetStringUTF16(
         delegate_->type() == InputWindowDialog::BUTTON_TYPE_ADD ? IDS_ADD
                                                                 : IDS_SAVE);
   }
   return string16();
 }
 
 bool ContentView::IsDialogButtonEnabled(ui::DialogButton button) const {
-  if (button == ui::DIALOG_BUTTON_OK &&
-      !delegate_->delegate()->IsValid(text_field_->text())) {
-    return false;
+  if (button == ui::DIALOG_BUTTON_OK) {
+    InputWindowDialog::InputTexts texts;
+    texts.push_back(text_field_->text());
+    if (!delegate_->delegate()->IsValid(texts)) {
+      return false;
+    }
   }
   return true;
 }
 
 bool ContentView::Accept() {
-  delegate_->delegate()->InputAccepted(text_field_->text());
+  InputWindowDialog::InputTexts texts;
+  texts.push_back(text_field_->text());
+  delegate_->delegate()->InputAccepted(texts);
   return true;
 }
 
 bool ContentView::Cancel() {
   delegate_->delegate()->InputCanceled();
   return true;
 }
 
 void ContentView::DeleteDelegate() {
   delete delegate_;
@@ skipping 89 matching lines @@
 
 void InputWindowDialogWin::Show() {
   window_->Show();
 }
 
 void InputWindowDialogWin::Close() {
   window_->Close();
 }
 
 // static
-InputWindowDialog* InputWindowDialog::Create(gfx::NativeWindow parent,
-                                             const string16& window_title,
-                                             const string16& label,
-                                             const string16& contents,
-                                             Delegate* delegate,
-                                             ButtonType type) {
-  return new InputWindowDialogWin(parent, window_title, label, contents,
-                                  delegate, type);
+InputWindowDialog* InputWindowDialog::Create(
+    gfx::NativeWindow parent,
+    const string16& window_title,
+    const LabelContentsPairs& label_contents_pairs,
+    Delegate* delegate,
+    ButtonType type) {
+  DCHECK_EQ(1U, label_contents_pairs.size());

[flackr, 2011/11/07 15:19:15]

Can you use InputWindowDialogWebUI here too on --use-more-webui? There has been
some debate over using WebUI dialogs on all platforms so it would be nice to
have it work behind a flag.

[mazda, 2011/11/08 11:24:24]

Done.

+  return new InputWindowDialogWin(parent,
+                                  window_title,
+                                  label_contents_pairs[0].first,
+                                  label_contents_pairs[0].second,
+                                  delegate,
+                                  type);
 }