Add --use-more-webui runtime flag to toggle WebUI replacements for native dialogs.

chrome/browser/bookmarks/bookmark_editor.h

 // 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.
 
 #ifndef CHROME_BROWSER_BOOKMARKS_BOOKMARK_EDITOR_H_
 #define CHROME_BROWSER_BOOKMARKS_BOOKMARK_EDITOR_H_
 #pragma once
 
 #include <utility>
 #include <vector>
 
 #include "base/string16.h"
 #include "ui/gfx/native_widget_types.h"
 
 class BookmarkNode;
 class GURL;
 class Profile;
 
 // Small, cross platform interface that shows the correct platform specific
 // bookmark editor dialog.
 class BookmarkEditor {
  public:
   // An enumeration of the possible configurations offered.
   enum Configuration {
     SHOW_TREE,
     NO_TREE
   };
 
   // Describes what the user is editing.
-  struct EditDetails {
+  class EditDetails {
+   public:
+    static EditDetails EditNode(const BookmarkNode* node);

[Rick Byers, 2011/08/18 19:25:30]

Nice, I like this change.

Add comments to these methods please.

[flackr, 2011/08/23 17:41:44]

Done.

+    static EditDetails AddNodeInFolder(const BookmarkNode* parent_node);
+    static EditDetails AddFolder(const BookmarkNode* parent_node);
+
     enum Type {
       // The user is editing an existing node in the model. The node the user
       // is editing is set in |existing_node|.
       EXISTING_NODE,
 
       // A new bookmark should be created if the user accepts the edit.
       // |existing_node| is null in this case.
       NEW_URL,
 
       // A new folder bookmark should be created if the user accepts the edit.
       // The contents of the folder should be that of |urls|.
       // |existing_node| is null in this case.
       NEW_FOLDER
     };
 
-    EditDetails();
-    explicit EditDetails(const BookmarkNode* node);
     ~EditDetails();
 
     // See description of enum value for details.
     Type type;

[Rick Byers, 2011/08/18 19:25:30]

Could you make the fields const now (eg. by having the private ctor take all the
field values as arguments)?  If it's easy, it would be nice if this were
immutable IMHO.  Not worth a ton of effort though.

[flackr, 2011/08/23 17:41:44]

Done.

 
     // If type == EXISTING_NODE this gives the existing node.
     const BookmarkNode* existing_node;
 
+    // If type == NEW_URL or type == NEW_FOLDER this gives the parent node
+    // to place the new node in.
+    const BookmarkNode* parent_node;
+
     // If type == NEW_FOLDER, this is the urls/title pairs to add to the
     // folder.
     std::vector<std::pair<GURL, string16> > urls;
+
+   private:
+    EditDetails();

[Rick Byers, 2011/08/18 19:25:30]

nice

   };
 
-  // Shows the bookmark editor. The bookmark editor allows editing an
+  // Shows the native bookmark editor. The bookmark editor allows editing an
   // existing node or creating a new bookmark node (as determined by
   // |details.type|). If |configuration| is SHOW_TREE, a tree is shown allowing
   // the user to choose the parent of the node.
   // |parent| gives the initial parent to select in the tree for the node.
   // |parent| is only used if |details.existing_node| is null.
-  // TODO(flackr): Rename this to ShowNative and add cross platform Show method
-  //     which will show a WebUI version of the dialog if --pure-views is set.
+  static void ShowNative(gfx::NativeWindow parent_window,

[Rick Byers, 2011/08/18 19:25:30]

This can be private now (or soon), right?  It would be really nice if this were
an implementation detail.

[flackr, 2011/08/23 17:41:44]

Done.

+                         Profile* profile,
+                         const BookmarkNode* parent,
+                         const EditDetails& details,
+                         Configuration configuration);
+
+  // Shows the bookmark editor. If --use-more-webui is enabled use the bookmark
+  // manager to add or edit bookmarks.

[Rick Byers, 2011/08/18 19:25:30]

add/move the detailed description of the args from above.

[flackr, 2011/08/23 17:41:44]

Done.

   static void Show(gfx::NativeWindow parent_window,
                    Profile* profile,
-                   const BookmarkNode* parent,
                    const EditDetails& details,
                    Configuration configuration);
 };
 
 #endif  // CHROME_BROWSER_BOOKMARKS_BOOKMARK_EDITOR_H_