Modify Ash MD system menu layout for title rows

ash/common/system/chromeos/bluetooth/tray_bluetooth.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 "ash/common/system/chromeos/bluetooth/tray_bluetooth.h"
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/tray/fixed_sized_scroll_view.h"
 #include "ash/common/system/tray/hover_highlight_view.h"
 #include "ash/common/system/tray/system_tray.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.h"
 #include "ash/common/system/tray/throbber_view.h"
 #include "ash/common/system/tray/tray_constants.h"
 #include "ash/common/system/tray/tray_details_view.h"
 #include "ash/common/system/tray/tray_item_more.h"
 #include "ash/common/system/tray/tray_popup_header_button.h"
 #include "ash/common/system/tray/tray_popup_item_style.h"
 #include "ash/common/system/tray/tray_popup_utils.h"
+#include "ash/common/system/tray/tri_view.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "device/bluetooth/bluetooth_common.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/color_palette.h"
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/paint_vector_icon.h"
@@ skipping 495 matching lines @@
       delegate->ToggleBluetooth();
     else
       NOTREACHED();
   }
 
   void CreateExtraTitleRowButtons() override {
     if (login_ == LoginStatus::LOCKED)
       return;
 
     if (UseMd()) {
-      toggle_ = title_row()->AddToggleButton(this);
-      settings_ = title_row()->AddSettingsButton(this, login_);
+      DCHECK(!toggle_);
+      DCHECK(!settings_);
+
+      tri_view()->SetContainerVisible(TriView::Container::END, true);
+
+      // TODO(tdanderson): Move common toggle-creation logic to TrayPopupUtils.
+      // See crbug.com/614453.
+      toggle_ = new views::ToggleButton(this);
+      toggle_->SetFocusForPlatform();
+      toggle_->SetAccessibleName(
+          ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
+              IDS_ASH_STATUS_TRAY_BLUETOOTH));
+      tri_view()->AddView(TriView::Container::END, toggle_);
+
+      settings_ = CreateSettingsButton(login_);
+      tri_view()->AddView(TriView::Container::END, settings_);
       return;
     }
 
     throbber_ = new ThrobberView;
     throbber_->SetTooltipText(
         l10n_util::GetStringUTF16(IDS_ASH_STATUS_TRAY_BLUETOOTH_DISCOVERING));
     title_row()->AddViewToRowNonMd(throbber_, false);
 
     // Do not allow toggling bluetooth in the lock screen.
     SystemTrayDelegate* delegate = WmShell::Get()->system_tray_delegate();
@@ skipping 180 matching lines @@
     detailed_->Update();
 }
 
 void TrayBluetooth::OnBluetoothDiscoveringChanged() {
   if (!detailed_)
     return;
   detailed_->Update();
 }
 
 }  // namespace ash