Clean up frame code a bit:

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

 // 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.
 
 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_
 
 #include "base/macros.h"
 #include "chrome/browser/ui/views/frame/opaque_browser_frame_view.h"
 #include "ui/views/layout/layout_manager.h"
@@ skipping 89 matching lines @@
   bool IsTitleBarCondensed() const;
 
  private:
   // Whether a specific button should be inserted on the leading or trailing
   // side.
   enum ButtonAlignment {
     ALIGN_LEADING,
     ALIGN_TRAILING
   };
 
-  // Determines whether the avatar should be shown on the right side of the tab
-  // strip (instead of the usual left).
-  bool ShouldAvatarBeOnRight() const;
+  // Determines whether the incognito icon should be shown on the right side of
+  // the tab strip (instead of the usual left).
+  bool ShouldIncognitoIconBeOnRight() const;
 
   // Determines the amount of spacing between the New Tab button and the element
   // to its immediate right.
   int NewTabCaptionSpacing() const;
 
   // Layout various sub-components of this view.
   void LayoutWindowControls(views::View* host);
   void LayoutTitleBar(views::View* host);
-  void LayoutAvatar(views::View* host);
+  void LayoutIncognitoIcon(views::View* host);
   void LayoutNewStyleAvatar(views::View* host);
 
   void ConfigureButton(views::View* host,
                        views::FrameButton button_id,
                        ButtonAlignment align,
                        int caption_y);
 
   // Sets the visibility of all buttons associated with |button_id| to false.
   void HideButton(views::FrameButton button_id);
 
   // Adds a window caption button to either the leading or trailing side.
   void SetBoundsForButton(views::View* host,
                           views::ImageButton* button,
                           ButtonAlignment align,
                           int caption_y);
 
   // Internal implementation of ViewAdded() and ViewRemoved().
   void SetView(int id, views::View* view);
 
   // Overriden from views::LayoutManager:
   void Layout(views::View* host) override;
   gfx::Size GetPreferredSize(const views::View* host) const override;
   void ViewAdded(views::View* host, views::View* view) override;
   void ViewRemoved(views::View* host, views::View* view) override;
 
   OpaqueBrowserFrameViewLayoutDelegate* delegate_;
 
-  // The layout rect of the avatar icon, if visible.
-  gfx::Rect avatar_bounds_;
-
   // The bounds of the ClientView.
   gfx::Rect client_view_bounds_;
 
   // The layout of the window icon, if visible.
   gfx::Rect window_icon_bounds_;
 
   // How far from the leading/trailing edge of the view the next window control
   // should be placed.
   int leading_button_start_;
   int trailing_button_start_;
@@ skipping 26 matching lines @@
   AvatarMenuButton* avatar_button_;
   views::View* new_avatar_button_;
 
   std::vector<views::FrameButton> leading_buttons_;
   std::vector<views::FrameButton> trailing_buttons_;
 
   DISALLOW_COPY_AND_ASSIGN(OpaqueBrowserFrameViewLayout);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_OPAQUE_BROWSER_FRAME_VIEW_LAYOUT_H_