Modify Ash MD system menu layout for title rows

ash/common/system/ime/tray_ime_chromeos.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/ime/tray_ime_chromeos.h"
 
 #include <vector>
 
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/session/session_state_delegate.h"
 #include "ash/common/system/chromeos/ime_menu/ime_list_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_controller.h"
 #include "ash/common/system/tray/system_tray_delegate.h"
 #include "ash/common/system/tray/system_tray_notifier.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_item_view.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/tray_utils.h"
+#include "ash/common/system/tray/tri_view.h"
 #include "ash/common/system/tray_accessibility.h"
 #include "ash/common/wm_shell.h"
 #include "ash/resources/vector_icons/vector_icons.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "grit/ash_resources.h"
 #include "grit/ash_strings.h"
 #include "ui/accessibility/ax_enums.h"
 #include "ui/accessibility/ax_node_data.h"
 #include "ui/base/resource/resource_bundle.h"
@@ skipping 116 matching lines @@
       ShowSettings();
   }
 
   void HandleButtonPressed(views::Button* sender,
                            const ui::Event& event) override {
     if (sender == settings_button_)
       ShowSettings();
   }
 
   void CreateExtraTitleRowButtons() override {
-    if (MaterialDesignController::IsSystemTrayMenuMaterial())
-      settings_button_ = title_row()->AddSettingsButton(this, login_);
+    if (MaterialDesignController::IsSystemTrayMenuMaterial()) {
+      // It is possible that the settings button has already been created
+      // through a previous call to Update().
+      if (settings_button_)
+        return;
+
+      tri_view()->SetContainerVisible(TriView::Container::END, true);
+      settings_button_ = CreateSettingsButton(login_);
+      tri_view()->AddView(TriView::Container::END, settings_button_);
+    }
   }
 
   void AppendSettings() {
     HoverHighlightView* container = new HoverHighlightView(this);
     container->AddLabel(
         ui::ResourceBundle::GetSharedInstance().GetLocalizedString(
             IDS_ASH_STATUS_TRAY_IME_SETTINGS),
         gfx::ALIGN_LEFT, false /* highlight */);
     AddChildView(container);
     settings_ = container;
@@ skipping 161 matching lines @@
   else
     Update();
 }
 
 bool TrayIME::ShouldDefaultViewBeVisible() {
   return is_visible_ && (ime_list_.size() > 1 || property_list_.size() > 1 ||
                          ShouldShowKeyboardToggle());
 }
 
 }  // namespace ash