Setting the touch wrench menu as default menu for ChromeOS

chrome/browser/media/media_stream_devices_menu_model.cc

 // 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.
 
 #include "chrome/browser/media/media_stream_devices_menu_model.h"
 
 #include <utility>
 
 #include "base/utf_string_conversions.h"
 #include "chrome/app/chrome_command_ids.h"
 #include "chrome/browser/ui/media_stream_infobar_delegate.h"
 #include "content/public/common/media_stream_request.h"
 #include "grit/generated_resources.h"
 #include "ui/base/l10n/l10n_util.h"
 
 MediaStreamDevicesMenuModel::MediaStreamDevicesMenuModel(
     const MediaStreamInfoBarDelegate* delegate)
     : ALLOW_THIS_IN_INITIALIZER_LIST(ui::SimpleMenuModel(this)),
       selected_command_id_audio_(-1),
       selected_command_id_video_(-1),
       always_allow_(false) {
   bool audio = delegate->HasAudio() && !delegate->GetAudioDevices().empty();
   bool video = delegate->HasVideo() && !delegate->GetVideoDevices().empty();
   if (video) {
     // The default command ID is the first element that will be inserted.
     selected_command_id_video_ = commands_.size();
     AddDevices(delegate->GetVideoDevices());
     if (audio)
-      AddSeparator();
+      AddSeparator(ui::NORMAL_SEPARATOR);
   }
   if (audio) {
     // The default command ID is the first element that will be inserted.
     selected_command_id_audio_ = commands_.size();
     AddDevices(delegate->GetAudioDevices());
   }
 
   // Show "always allow" option only for the secure connection.
   if (delegate->GetSecurityOrigin().SchemeIsSecure())
     AddAlwaysAllowOption(audio, video);
@@ skipping 65 matching lines @@
 }
 
 void MediaStreamDevicesMenuModel::AddAlwaysAllowOption(bool audio, bool video) {
   int command_id = IDC_MEDIA_STREAM_DEVICE_ALWAYS_ALLOW;
   int message_id = IDS_MEDIA_CAPTURE_ALWAYS_ALLOW_AUDIO_AND_VIDEO;
   if (audio && !video)
     message_id = IDS_MEDIA_CAPTURE_ALWAYS_ALLOW_AUDIO_ONLY;
   else if (!audio && video)
     message_id = IDS_MEDIA_CAPTURE_ALWAYS_ALLOW_VIDEO_ONLY;
 
-  AddSeparator();
+  AddSeparator(ui::NORMAL_SEPARATOR);
   AddCheckItem(command_id, l10n_util::GetStringUTF16(message_id));
 }