Work on USE_ASH/USE_AURA split.

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

 // 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.
 
 #include "chrome/browser/ui/views/frame/browser_view.h"
 
 #include <algorithm>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
@@ skipping 84 matching lines @@
 #include "ui/views/controls/single_split_view.h"
 #include "ui/views/events/event.h"
 #include "ui/views/focus/external_focus_tracker.h"
 #include "ui/views/focus/view_storage.h"
 #include "ui/views/layout/grid_layout.h"
 #include "ui/views/widget/native_widget.h"
 #include "ui/views/widget/root_view.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/dialog_delegate.h"
 
-#if defined(USE_AURA)
+#if defined(USE_ASH)
 #include "ash/launcher/launcher.h"
 #include "ash/launcher/launcher_model.h"
 #include "ash/shell.h"
-#include "chrome/browser/ui/views/accelerator_table.h"
 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
 #include "chrome/browser/ui/views/ash/launcher/launcher_updater.h"
 #include "chrome/browser/ui/views/ash/window_positioner.h"
-#include "ui/gfx/screen.h"
 #elif defined(OS_WIN)
 #include "chrome/browser/aeropeek_manager.h"
 #include "chrome/browser/jumplist_win.h"
 #include "ui/views/widget/native_widget_win.h"
 #endif
 
+#if defined(USE_AURA)
+#include "chrome/browser/ui/views/accelerator_table.h"
+#include "ui/gfx/screen.h"
+#endif
+
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/ui/views/keyboard_overlay_dialog_view.h"
 #include "chrome/browser/ui/webui/chromeos/mobile_setup_dialog.h"
 #endif
 
 #if defined(ENABLE_ONE_CLICK_SIGNIN)
 #include "chrome/browser/ui/views/sync/one_click_signin_bubble_view.h"
 #endif
 
 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
@@ skipping 219 matching lines @@
       hung_window_detector_(&hung_plugin_action_),
       ticker_(0),
 #endif
       force_location_bar_focus_(false),
       move_observer_(NULL),
       ALLOW_THIS_IN_INITIALIZER_LIST(color_change_listener_(this)) {
   browser_->tabstrip_model()->AddObserver(this);
 }
 
 BrowserView::~BrowserView() {
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   // Destroy LauncherUpdater early on as it listens to the TabstripModel, which
   // is destroyed by the browser.
   icon_updater_.reset();
 #endif
 
   browser_->tabstrip_model()->RemoveObserver(this);
 
 #if defined(OS_WIN) && !defined(USE_AURA)
   // Remove this observer.
   if (aeropeek_manager_.get())
@@ skipping 614 matching lines @@
   // Try to focus the next pane; if SetPaneFocusAndFocusDefault returns
   // false it means the pane didn't have any focusable controls, so skip
   // it and try the next one.
   for (;;) {
     if (forwards)
       index = (index + 1) % count;
     else
       index = ((index - 1) + count) % count;
 
     if (index == special_index) {
-#if defined(OS_CHROMEOS) && defined(USE_AURA)
+#if defined(USE_ASH)
       ash::Shell::GetInstance()->RotateFocus(
           forwards ? ash::Shell::FORWARD : ash::Shell::BACKWARD);
+#endif
       break;
-#endif
     } else if (index < pane_count) {
       if (accessible_panes[index]->SetPaneFocusAndFocusDefault())
         break;
     } else {
       accessible_views[index]->RequestFocus();
       break;
     }
   }
 }
 
@@ skipping 596 matching lines @@
 views::View* BrowserView::GetContentsView() {
   return contents_container_;
 }
 
 views::ClientView* BrowserView::CreateClientView(views::Widget* widget) {
   return this;
 }
 
 void BrowserView::OnWidgetActivationChanged(views::Widget* widget,
                                             bool active) {
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   if (icon_updater_.get())
     icon_updater_->BrowserActivationStateChanged();
 #endif
 
   if (active) {
     BrowserList::SetLastActive(browser_.get());
     browser_->OnWindowActivated();
   }
 }
 
@@ skipping 813 matching lines @@
     delete toolbar_;
   }
   toolbar_ = toolbar;
   if (toolbar) {
     AddChildView(toolbar_);
     toolbar_->Init();
   }
 }
 
 void BrowserView::CreateLauncherIcon() {
-#if defined(USE_AURA)
+#if defined(USE_ASH)
   if (!icon_updater_.get())
     icon_updater_.reset(LauncherUpdater::Create(browser_.get()));
 #endif  // defined(USE_AURA)
 }
 
 #if !defined(OS_CHROMEOS) || defined(USE_AURA)
 // static
 BrowserWindow* BrowserWindow::CreateBrowserWindow(Browser* browser) {
   // Create the view and the frame. The frame will attach itself via the view
   // so we don't need to do anything with the pointer.
@@ skipping 36 matching lines @@
     return;
 
   PasswordGenerationBubbleView* bubble =
       new PasswordGenerationBubbleView(bounds,
                                        this,
                                        web_contents->GetRenderViewHost());
   views::BubbleDelegateView::CreateBubble(bubble);
   bubble->SetAlignment(views::BubbleBorder::ALIGN_EDGE_TO_ANCHOR_EDGE);
   bubble->Show();
 }