Upstream version 5.34.104.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / cocoa / extensions / media_galleries_dialog_cocoa.h

diff --git a/src/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h b/src/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h
index 8bccc28..50b014f 100644 (file)
--- a/src/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h
+++ b/src/chrome/browser/ui/cocoa/extensions/media_galleries_dialog_cocoa.h
@@ -47,7 +47,7 @@ class MediaGalleriesDialogCocoa : public ConstrainedWindowMacDelegate,
   virtual void OnConstrainedWindowClosed(
       ConstrainedWindowMac* window) OVERRIDE;
 
-  ui::MenuModel* GetContextMenuModel(MediaGalleryPrefId prefid);
+  ui::MenuModel* GetContextMenu(MediaGalleryPrefId prefid);
 
  private:
   FRIEND_TEST_ALL_PREFIXES(MediaGalleriesDialogBrowserTest, Close);
@@ -88,7 +88,7 @@ class MediaGalleriesDialogCocoa : public ConstrainedWindowMacDelegate,
   base::scoped_nsobject<NSView> checkbox_container_;
 
   // Container view for the main dialog contents.
-  base::scoped_nsobject<NSBox> accessory_;
+  base::scoped_nsobject<NSBox> main_container_;
 
   // An Objective-C class to route callbacks from Cocoa code.
   base::scoped_nsobject<MediaGalleriesCocoaController> cocoa_controller_;