Adjusted the spacing of the profile tag in maximized opaque frames.

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

 // Copyright (c) 2011 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.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/utf_string_conversions.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 82 matching lines @@
 // looking too cluttered.
 const int kNewTabCaptionMaximizedSpacing = 16;
 // How far to indent the tabstrip from the left side of the screen when there
 // is no OTR icon.
 const int kTabStripIndent = 1;
 // Inset from the top of the toolbar/tabstrip to the shadow. Used only for
 // vertical tabs.
 const int kVerticalTabBorderInset = 3;
 // Y position for profile tag inside the frame.
 const int kProfileTagYPosition = 1;
-// Offset y position of profile button and tag by this amount when maximized.
-const int kProfileElementMaximizedYOffset = 6;
 
 // Converts |bounds| from |src|'s coordinate system to |dst|, and checks if
 // |pt| is contained within.
 bool ConvertedContainsCheck(gfx::Rect bounds, const views::View* src,
                             const views::View* dst, const gfx::Point& pt) {
   DCHECK(src);
   DCHECK(dst);
   gfx::Point origin(bounds.origin());
   views::View::ConvertPointToView(src, dst, &origin);
   bounds.set_origin(origin);
@@ skipping 1062 matching lines @@
   profile_button_->SetVisible(true);
   int x_tag =
       // The x position of minimize button in the frame
       minimize_button_->x() -
           // - the space between the minimize button and the profile button
           ProfileMenuButton::kProfileTagHorizontalSpacing -
           // - the width of the profile button
           profile_button_->GetPreferredSize().width();
   // Adjust for different default font sizes on different Windows platforms.
   int y_tag = profile_button_->font().GetHeight() < 14 ? 2 : 0;
-  int y_maximized_offset = frame_->IsMaximized() ?
-      kProfileElementMaximizedYOffset : 0;
+  int maximized = frame_->IsMaximized();
   profile_button_->SetBounds(
       x_tag,
-      y_tag + y_maximized_offset,
+      maximized ? 0 : y_tag,
       profile_button_->GetPreferredSize().width(),
       profile_button_->GetPreferredSize().height());
 
   if (!profile_name.empty()) {
     profile_tag_->SetVisible(true);
     profile_tag_->SetBounds(
         x_tag,
-        kProfileTagYPosition + y_maximized_offset,
+        maximized ? 0 : kProfileTagYPosition,
         profile_button_->GetPreferredSize().width(),
         ProfileTagView::kProfileTagHeight);
-    profile_tag_->SetVisible(true);
   } else {
     profile_tag_->SetVisible(false);
   }
 }
 
 gfx::Rect OpaqueBrowserFrameView::CalculateClientAreaBounds(int width,
                                                             int height) const {
   int top_height = NonClientTopBorderHeight(false, false);
   int border_thickness = NonClientBorderThickness();
   return gfx::Rect(border_thickness, top_height,
                    std::max(0, width - (2 * border_thickness)),
                    std::max(0, height - GetReservedHeight() -
                        top_height - border_thickness));
 }
 
 void OpaqueBrowserFrameView::RegisterLoginNotifications() {
   PrefService* pref_service = browser_view_->browser()->profile()->GetPrefs();
   DCHECK(pref_service);
   username_pref_.Init(prefs::kGoogleServicesUsername, pref_service, this);
 }