Support displaying the avatar label on the right side.

chrome/browser/ui/views/frame/opaque_browser_frame_view_layout.cc

 // Copyright 2013 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/ui/views/frame/opaque_browser_frame_view_layout.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/profiles/profiles_state.h"
+#include "chrome/browser/ui/views/avatar_label.h"
 #include "chrome/browser/ui/views/avatar_menu_button.h"
 #include "chrome/common/chrome_switches.h"
 #include "chrome/common/profile_management_switches.h"
 #include "ui/gfx/font.h"
 #include "ui/views/controls/button/image_button.h"
 #include "ui/views/controls/label.h"
 
 #if defined(OS_WIN)
 #include "win8/util/win8_util.h"
 #endif  // OS_WIN
@@ skipping 420 matching lines @@
       avatar_x,
       avatar_y,
       incognito_icon.width(),
       delegate_->ShouldShowAvatar() ? (avatar_bottom - avatar_y) : 0);
   if (avatar_button_) {
     avatar_button_->set_button_on_right(avatar_on_right);
     avatar_button_->SetBoundsRect(avatar_bounds_);
 
     int edge_offset;
     if (avatar_label_) {
+      avatar_label_->SetLabelOnRight(avatar_on_right);
       // Space between the bottom of the avatar and the bottom of the avatar
       // label.
       const int kAvatarLabelBottomSpacing = 3;
       gfx::Size label_size = avatar_label_->GetPreferredSize();
-      // The x-position of the avatar label should be slightly to the left of
-      // the avatar menu button. Therefore we use the |leading_button_start_|
-      // value directly.
+      // The outside edge of the avatar label should be just outside that of the
+      // avatar menu button.
+      int avatar_label_x = avatar_on_right ?
+          (host->width() - trailing_button_start_ - label_size.width()) :
+          leading_button_start_;
       gfx::Rect label_bounds(
-          leading_button_start_,
+          avatar_label_x,
           avatar_bottom - kAvatarLabelBottomSpacing - label_size.height(),
           label_size.width(),
           delegate_->ShouldShowAvatar() ? label_size.height() : 0);
       avatar_label_->SetBoundsRect(label_bounds);
       edge_offset = label_size.width();
     } else {
       edge_offset = kAvatarOuterSpacing + incognito_icon.width();
     }
     if (avatar_on_right)
       trailing_button_start_ += edge_offset;
@@ skipping 166 matching lines @@
       window_icon_ = view;
       break;
     case VIEW_ID_WINDOW_TITLE:
       if (view) {
         DCHECK_EQ(std::string(views::Label::kViewClassName),
                   view->GetClassName());
       }
       window_title_ = static_cast<views::Label*>(view);
       break;
     case VIEW_ID_AVATAR_LABEL:
-      avatar_label_ = view;
+      avatar_label_ = static_cast<AvatarLabel*>(view);
       break;
     case VIEW_ID_AVATAR_BUTTON:
       if (view) {
         DCHECK_EQ(std::string(AvatarMenuButton::kViewClassName),
                   view->GetClassName());
       }
       avatar_button_ = static_cast<AvatarMenuButton*>(view);
       break;
     case VIEW_ID_NEW_AVATAR_BUTTON:
       new_avatar_button_ = view;
@@ skipping 43 matching lines @@
 
 void OpaqueBrowserFrameViewLayout::ViewAdded(views::View* host,
                                              views::View* view) {
   SetView(view->id(), view);
 }
 
 void OpaqueBrowserFrameViewLayout::ViewRemoved(views::View* host,
                                                views::View* view) {
   SetView(view->id(), NULL);
 }