Make the combobox in ContentSettingBubbleContents an actual combobox.

chrome/chrome_browser_ui.gypi

 # Copyright 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.
 
 {
   'variables': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 1272 matching lines @@
       'browser/ui/cocoa/website_settings/permission_selector_button.h',
       'browser/ui/cocoa/website_settings/permission_selector_button.mm',
       'browser/ui/cocoa/website_settings/split_block_button.h',
       'browser/ui/cocoa/website_settings/split_block_button.mm',
       'browser/ui/cocoa/website_settings/website_settings_bubble_controller.h',
       'browser/ui/cocoa/website_settings/website_settings_bubble_controller.mm',
       'browser/ui/cocoa/website_settings/website_settings_utils_cocoa.h',
       'browser/ui/cocoa/website_settings/website_settings_utils_cocoa.mm',
       'browser/ui/cocoa/window_size_autosaver.h',
       'browser/ui/cocoa/window_size_autosaver.mm',
+      # TODO(estade): this class should be deleted in favor of a combobox model.
+      # See crbug.com/590850
+      'browser/ui/content_settings/content_setting_media_menu_model.cc',
+      'browser/ui/content_settings/content_setting_media_menu_model.h',
     ],
     # Files used only on desktop systems (not iOS, Android, ChromeOS).
     'chrome_browser_ui_desktop_sources': [
       'browser/ui/startup/default_browser_prompt.cc',
       'browser/ui/startup/default_browser_prompt.h',
       'browser/ui/startup/default_browser_prompt_win.cc',
       'browser/ui/sync/one_click_signin_links_delegate.h',
       'browser/ui/sync/one_click_signin_links_delegate_impl.cc',
       'browser/ui/sync/one_click_signin_links_delegate_impl.h',
       'browser/ui/sync/one_click_signin_sync_observer.cc',
@@ skipping 279 matching lines @@
       'browser/ui/chrome_web_modal_dialog_manager_delegate.h',
       'browser/ui/collected_cookies_infobar_delegate.cc',
       'browser/ui/collected_cookies_infobar_delegate.h',
       'browser/ui/confirm_bubble_model.cc',
       'browser/ui/confirm_bubble_model.h',
       'browser/ui/content_settings/content_setting_bubble_model.cc',
       'browser/ui/content_settings/content_setting_bubble_model.h',
       'browser/ui/content_settings/content_setting_bubble_model_delegate.h',
       'browser/ui/content_settings/content_setting_image_model.cc',
       'browser/ui/content_settings/content_setting_image_model.h',
-      'browser/ui/content_settings/content_setting_media_menu_model.cc',
-      'browser/ui/content_settings/content_setting_media_menu_model.h',
       'browser/ui/exclusive_access/exclusive_access_bubble.cc',
       'browser/ui/exclusive_access/exclusive_access_bubble.h',
       'browser/ui/exclusive_access/exclusive_access_bubble_type.cc',
       'browser/ui/exclusive_access/exclusive_access_bubble_type.h',
       'browser/ui/exclusive_access/exclusive_access_context.cc',
       'browser/ui/exclusive_access/exclusive_access_context.h',
       'browser/ui/exclusive_access/exclusive_access_controller_base.cc',
       'browser/ui/exclusive_access/exclusive_access_controller_base.h',
       'browser/ui/exclusive_access/exclusive_access_manager.cc',
       'browser/ui/exclusive_access/exclusive_access_manager.h',
@@ skipping 1696 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }