Miscellaneous cleanup.

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

Index: chrome/browser/ui/views/frame/glass_browser_frame_view.h
diff --git a/chrome/browser/ui/views/frame/glass_browser_frame_view.h b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
index 748ef25c38f03f1d82e55f668a8f306120c86f38..21871be62ccd0e3aeabbb97369ce771e28f536ee 100644
--- a/chrome/browser/ui/views/frame/glass_browser_frame_view.h
+++ b/chrome/browser/ui/views/frame/glass_browser_frame_view.h
@@ -73,7 +73,7 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
   void PaintRestoredClientEdge(gfx::Canvas* canvas);
 
   // Layout various sub-components of this view.
-  void LayoutAvatar();
+  void LayoutIncognitoIcon();
   void LayoutNewStyleAvatar();
   void LayoutClientView();
 
@@ -90,8 +90,8 @@ class GlassBrowserFrameView : public BrowserNonClientFrameView,
   // Displays the next throbber frame.
   void DisplayNextThrobberFrame();
 
-  // The layout rect of the avatar icon, if visible.
-  gfx::Rect avatar_bounds_;
+  // The layout rect of the incognito icon, if visible.
+  gfx::Rect incognito_bounds_;
 
   // The bounds of the ClientView.
   gfx::Rect client_view_bounds_;