Make a controller interface for media galleries dialogs.

chrome/browser/ui/views/extensions/media_galleries_dialog_views.h

 // Copyright (c) 2012 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_UI_VIEWS_EXTENSIONS_MEDIA_GALLERIES_DIALOG_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_EXTENSIONS_MEDIA_GALLERIES_DIALOG_VIEWS_H_
 
 #include <map>
 
 #include "base/compiler_specific.h"
@@ skipping 47 matching lines @@
   virtual void ShowContextMenuForView(views::View* source,
                                       const gfx::Point& point,
                                       ui::MenuSourceType source_type) OVERRIDE;
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, InitializeCheckboxes);
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ToggleCheckboxes);
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, UpdateAdds);
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ForgetDeletes);
 
-  typedef std::map<GalleryDialogId, MediaGalleryCheckboxView*> CheckboxMap;
+  typedef std::map<MediaGalleryPrefId, MediaGalleryCheckboxView*> CheckboxMap;
 
   void InitChildViews();
 
   // Adds a checkbox or updates an existing checkbox. Returns true if a new one
   // was added.
   bool AddOrUpdateGallery(
-      const MediaGalleriesDialogController::GalleryPermission& gallery,
+      const MediaGalleriesDialogController::Entry& gallery,
       views::View* container,
       int trailing_vertical_space);
 
   void ShowContextMenu(const gfx::Point& point,
                        ui::MenuSourceType source_type,
-                       GalleryDialogId id);
+                       MediaGalleryPrefId id);
 
   // Whether |controller_| has a valid WebContents or not.
   // In unit tests, it may not.
   bool ControllerHasWebContents() const;
 
   MediaGalleriesDialogController* controller_;
 
   // The containing window (a weak pointer).
   views::Widget* window_;
 
   // The contents of the dialog. Owned by |window_|'s RootView except for tests.
   views::View* contents_;
 
   // A map from gallery ID to views::Checkbox view.
   CheckboxMap checkbox_map_;
 
   // Pointer to the button to add a new gallery. Owned by parent in

[Lei Zhang, 2014/06/05 07:56:25]

update comment

[vandebo (ex-Chrome), 2014/06/05 19:25:30]

Done.

   // the dialog views tree.
-  views::LabelButton* add_gallery_button_;
+  views::LabelButton* auxilliary_button_;
 
   // This tracks whether the confirm button can be clicked. It starts as false
   // if no checkboxes are ticked. After there is any interaction, or some
   // checkboxes start checked, this will be true.
   bool confirm_available_;
 
   // True if the user has pressed accept.
   bool accepted_;
 
   scoped_ptr<views::MenuRunner> context_menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_EXTENSIONS_MEDIA_GALLERIES_DIALOG_VIEWS_H_