Abstract media galleries context menu code and use it in scan result dialog.

chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.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_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_
 #define CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_
 
 #import <Cocoa/Cocoa.h>
 
 #include "base/gtest_prod_util.h"
 #include "chrome/browser/media_galleries/media_galleries_dialog_controller.h"
 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_mac.h"
 
 @class ConstrainedWindowAlert;
 @class MediaGalleriesCocoaController;
 
 class MediaGalleriesDialogBrowserTest;
 class MediaGalleriesDialogTest;
 
-namespace ui {
-class MenuModel;
-}
-

[groby-ooo-7-16, 2014/01/29 05:01:37]

nit: Keep the forward declare here, since ui::MenuModel is not part of the
MediaGalleriesDialog API

[vandebo (ex-Chrome), 2014/01/29 17:16:55]

Done.

 // This class displays an alert that can be used to grant permission for
 // extensions to access a gallery (media folders).
 class MediaGalleriesDialogCocoa : public ConstrainedWindowMacDelegate,
                                   public MediaGalleriesDialog {
  public:
   MediaGalleriesDialogCocoa(
       MediaGalleriesDialogController* controller,
       MediaGalleriesCocoaController* delegate);
   virtual ~MediaGalleriesDialogCocoa();
 
   // Called when the user clicks the accept button.
   void OnAcceptClicked();
   // Called when the user clicks the cancel button.
   void OnCancelClicked();
   // Called when the user clicks the Add Gallery button.
   void OnAddFolderClicked();
   // Called when the user toggles a gallery checkbox.
   void OnCheckboxToggled(NSButton* checkbox);
 
   // MediaGalleriesDialog implementation:
   virtual void UpdateGalleries() OVERRIDE;
 
   // ConstrainedWindowMacDelegate implementation.
   virtual void OnConstrainedWindowClosed(
       ConstrainedWindowMac* window) OVERRIDE;
 
-  ui::MenuModel* GetContextMenuModel(MediaGalleryPrefId prefid);
+  ui::MenuModel* GetContextMenu(MediaGalleryPrefId prefid);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogBrowserTest, Close);
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, InitializeCheckboxes);
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ToggleCheckboxes);
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, UpdateAdds);
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogTest, ForgetDeletes);
 
   void UpdateGalleryCheckbox(const MediaGalleryPrefInfo& gallery,
                              bool permitted,
@@ skipping 29 matching lines @@
   // Container view for the main dialog contents.
   base::scoped_nsobject<NSBox> accessory_;
 
   // An Objective-C class to route callbacks from Cocoa code.
   base::scoped_nsobject<MediaGalleriesCocoaController> cocoa_controller_;
 
   DISALLOW_COPY_AND_ASSIGN(MediaGalleriesDialogCocoa);
 };
 
 #endif  // CHROME_BROWSER_UI_COCOA_EXTENSIONS_MEDIA_GALLERIES_DIALOG_COCOA_H_