Work on USE_ASH/USE_AURA split.

chrome/browser/ui/views/frame/browser_view.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_VIEW_H_
 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
 #pragma once
 
 #include <map>
 #include <string>
@@ skipping 197 matching lines @@
   void FullScreenStateChanged();
 
   // Restores the focused view. This is also used to set the initial focus
   // when a new browser window is created.
   void RestoreFocus();
 
   void set_move_observer(BrowserWindowMoveObserver* observer) {
     move_observer_ = observer;
   }
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   LauncherUpdater* icon_updater() const { return icon_updater_.get(); }
 #endif
 
   // Overridden from BrowserWindow:
   virtual void Show() OVERRIDE;
   virtual void ShowInactive() OVERRIDE;
   virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
   virtual void Close() OVERRIDE;
   virtual void Activate() OVERRIDE;
   virtual void Deactivate() OVERRIDE;
@@ skipping 435 matching lines @@
   // plugin window.
   HungPluginAction hung_plugin_action_;
 
   // The custom JumpList for Windows 7.
   scoped_refptr<JumpList> jumplist_;
 
   // The custom AeroPeek manager for Windows 7.
   scoped_ptr<AeroPeekManager> aeropeek_manager_;
 #endif
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   scoped_ptr<LauncherUpdater> icon_updater_;
 #endif
 
   // The timer used to update frames for the Loading Animation.
   base::RepeatingTimer<BrowserView> loading_animation_timer_;
 
   UnhandledKeyboardEventHandler unhandled_keyboard_event_handler_;
 
   // Used to measure the loading spinner animation rate.
   base::TimeTicks last_animation_time_;
 
   // If this flag is set then SetFocusToLocationBar() will set focus to the
   // location bar even if the browser window is not active.
   bool force_location_bar_focus_;
 
   PendingFullscreenRequest fullscreen_request_;
 
   BrowserWindowMoveObserver* move_observer_;
 
   gfx::ScopedSysColorChangeListener color_change_listener_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserView);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_