Work on USE_ASH/USE_AURA split.

chrome/browser/ui/views/ash/browser_non_client_frame_view_ash.h

 // 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.
 
-#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
-#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
+#ifndef CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
+#define CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_
 #pragma once
 
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/ui/views/frame/browser_non_client_frame_view.h"
 #include "chrome/browser/ui/views/tab_icon_view.h"
 #include "ui/views/controls/button/button.h"  // ButtonListener
 
 namespace ash {
 class FramePainter;
 }
 namespace views {
 class ImageButton;
 }
 
-class BrowserNonClientFrameViewAura : public BrowserNonClientFrameView,
-                                      public views::ButtonListener,
-                                      public TabIconView::TabIconViewModel {
+class BrowserNonClientFrameViewAsh : public BrowserNonClientFrameView,
+                                     public views::ButtonListener,
+                                     public TabIconView::TabIconViewModel {
  public:
-  BrowserNonClientFrameViewAura(BrowserFrame* frame, BrowserView* browser_view);
-  virtual ~BrowserNonClientFrameViewAura();
+  BrowserNonClientFrameViewAsh(BrowserFrame* frame, BrowserView* browser_view);
+  virtual ~BrowserNonClientFrameViewAsh();
 
   void Init();
 
   // BrowserNonClientFrameView overrides:
   virtual gfx::Rect GetBoundsForTabStrip(views::View* tabstrip) const OVERRIDE;
   virtual int GetHorizontalTabStripVerticalOffset(
       bool force_restored) const OVERRIDE;
   virtual void UpdateThrobber(bool running) OVERRIDE;
 
   // views::NonClientFrameView overrides:
@@ skipping 48 matching lines @@
   // For popups, the window icon.
   TabIconView* window_icon_;
 
   // Painter for the frame header.
   scoped_ptr<ash::FramePainter> frame_painter_;
 
   // If true the |size_button_| minimizes, otherwise it toggles between
   // maximized and restored.
   bool size_button_minimizes_;
 
-  DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAura);
+  DISALLOW_COPY_AND_ASSIGN(BrowserNonClientFrameViewAsh);
 };
 
-#endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_NON_CLIENT_FRAME_VIEW_AURA_H_
+#endif  // CHROME_BROWSER_UI_VIEWS_ASH_BROWSER_NON_CLIENT_FRAME_VIEW_ASH_H_