Reland 10124005

Adding MediaStream Infobar for Mac.

TBR=xians@chromium.org
BUG=124181
TEST=

Review URL: https://chromiumcodereview.appspot.com/10322002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134956 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 20 insertions, 20 deletions

diff --git a/chrome/browser/media/media_stream_devices_menu_model.cc b/chrome/browser/media/media_stream_devices_menu_model.cc
index 119d424..0355767 100644
--- a/chrome/browser/media/media_stream_devices_menu_model.cc
+++ b/chrome/browser/media/media_stream_devices_menu_model.cc
@@ -36,20 +36,6 @@ MediaStreamDevicesMenuModel::MediaStreamDevicesMenuModel(
 MediaStreamDevicesMenuModel::~MediaStreamDevicesMenuModel() {
 }
 
-void MediaStreamDevicesMenuModel::AddDevices(
-    const content::MediaStreamDevices& devices) {
-  for (size_t i = 0; i < devices.size(); ++i) {
-    int command_id = commands_.size();
-    commands_.insert(std::make_pair(command_id, devices[i]));
-    int message_id = (devices[i].type ==
-        content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE) ?
-        IDS_MEDIA_CAPTURE_MIC : IDS_MEDIA_CAPTURE_VIDEO;
-    AddCheckItem(command_id,
-                 l10n_util::GetStringFUTF16(message_id,
-                                            UTF8ToUTF16(devices[i].name)));
-  }
-}
-
 bool MediaStreamDevicesMenuModel::GetSelectedDeviceId(
     content::MediaStreamDeviceType type,
     std::string* device_id) const {
@@ -85,3 +71,17 @@ void MediaStreamDevicesMenuModel::ExecuteCommand(int command_id) {
   else
     selected_command_id_video_ = command_id;
 }
+
+void MediaStreamDevicesMenuModel::AddDevices(
+    const content::MediaStreamDevices& devices) {
+  for (size_t i = 0; i < devices.size(); ++i) {
+    int command_id = commands_.size();
+    commands_.insert(std::make_pair(command_id, devices[i]));
+    int message_id = (devices[i].type ==
+        content::MEDIA_STREAM_DEVICE_TYPE_AUDIO_CAPTURE) ?
+        IDS_MEDIA_CAPTURE_MIC : IDS_MEDIA_CAPTURE_VIDEO;
+    AddCheckItem(command_id,
+                 l10n_util::GetStringFUTF16(message_id,
+                                            UTF8ToUTF16(devices[i].name)));
+  }
+}
diff --git a/chrome/browser/media/media_stream_devices_menu_model.h b/chrome/browser/media/media_stream_devices_menu_model.h
index fa22ae0..8662347 100644
--- a/chrome/browser/media/media_stream_devices_menu_model.h
+++ b/chrome/browser/media/media_stream_devices_menu_model.h
@@ -30,12 +30,6 @@ class MediaStreamDevicesMenuModel : public ui::SimpleMenuModel,
       content::MediaStreamDeviceType type,
       std::string* device_id) const;
 
- private:
-  typedef std::map<int, content::MediaStreamDevice> CommandMap;
-
-  // Internal method to add the |devices| to the current menu.
-  void AddDevices(const content::MediaStreamDevices& devices);
-
   // ui::SimpleMenuModel::Delegate implementation:
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
@@ -44,6 +38,12 @@ class MediaStreamDevicesMenuModel : public ui::SimpleMenuModel,
       ui::Accelerator* accelerator) OVERRIDE;
   virtual void ExecuteCommand(int command_id) OVERRIDE;
 
+ private:
+  typedef std::map<int, content::MediaStreamDevice> CommandMap;
+
+  // Internal method to add the |devices| to the current menu.
+  void AddDevices(const content::MediaStreamDevices& devices);
+
   // Map of command IDs to devices.
   CommandMap commands_;