Split the Media settings UI into separate microphone and camera sections.

chrome/browser/ui/webui/options/content_settings_handler.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_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
 #define CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_
 
 #include <string>
 
 #include "base/memory/scoped_ptr.h"
@@ skipping 80 matching lines @@
   enum LinkType {
     DEFAULT_SETTING = 0,
     EXCEPTIONS,
   };
 
   // Functions that call into the page -----------------------------------------
 
   // Updates the page with the default settings (allow, ask, block, etc.)
   void UpdateSettingDefaultFromModel(ContentSettingsType type);
 
-  // Updates the media radio buttons according to the enabled split prefs.
-  void UpdateMediaSettingsView();
+  // Compares the media default settings with flash and updates the flash links'
+  // visibility accordingly.
+  void CompareMediaSettingsWithFlash();
 
   // Clobbers and rebuilds the specific content setting type exceptions table.
   void UpdateExceptionsViewFromModel(ContentSettingsType type);
 
   // Clobbers and rebuilds the specific content setting type exceptions
   // OTR table.
   void UpdateOTRExceptionsViewFromModel(ContentSettingsType type);
 
   // Clobbers and rebuilds all the exceptions tables in the page (both normal
   // and OTR tables).
   void UpdateAllExceptionsViewsFromModel();
 
   // As above, but only OTR tables.
   void UpdateAllOTRExceptionsViewsFromModel();
 
   // Clobbers and rebuilds just the geolocation exception table.
   void UpdateGeolocationExceptionsView();
 
   // Clobbers and rebuilds just the desktop notification exception table.
   void UpdateNotificationExceptionsView();
 
-  // Clobbers and rebuilds just the Media device exception table.
-  void UpdateMediaExceptionsView();
+  // Compares the combined microphone and camera exceptions with Flash
+  // exceptions and updates the flash links' visibility accordingly.
+  void CompareMediaExceptionsWithFlash();
 
   // Clobbers and rebuilds just the MIDI SysEx exception table.
   void UpdateMIDISysExExceptionsView();
 
   // Modifies the zoom level exceptions list to display correct chrome
   // signin page entry. When the legacy (non-WebView-based) signin page
   // goes away, this function can be removed.
   void AdjustZoomLevelsListForSigninPageIfNecessary(
       content::HostZoomMap::ZoomLevelVector* zoom_levels);
 
@@ skipping 12 matching lines @@
   void UpdateHandlersEnabledRadios();
 
   // Removes one geolocation exception. |args| contains the parameters passed to
   // RemoveException().
   void RemoveGeolocationException(const base::ListValue* args);
 
   // Removes one notification exception. |args| contains the parameters passed
   // to RemoveException().
   void RemoveNotificationException(const base::ListValue* args);
 
-  // Removes one media camera and microphone exception. |args| contains the
-  // parameters passed to RemoveException().
-  void RemoveMediaException(const base::ListValue* args);
-
   // Removes one exception of |type| from the host content settings map. |args|
   // contains the parameters passed to RemoveException().
   void RemoveExceptionFromHostContentSettingsMap(
       const base::ListValue* args,
       ContentSettingsType type);
 
   // Removes one zoom level exception. |args| contains the parameters passed to
   // RemoveException().
   void RemoveZoomLevelException(const base::ListValue* args);
 
@@ skipping 62 matching lines @@
   scoped_ptr<content::HostZoomMap::Subscription>
       signin_host_zoom_map_subscription_;
   ScopedObserver<HostContentSettingsMap, content_settings::Observer> observer_;
 
   DISALLOW_COPY_AND_ASSIGN(ContentSettingsHandler);
 };
 
 }  // namespace options
 
 #endif  // CHROME_BROWSER_UI_WEBUI_OPTIONS_CONTENT_SETTINGS_HANDLER_H_