Rename BrowserFrameAura to BrowserFrameAsh

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

Index: chrome/browser/ui/views/frame/browser_frame_aura.cc
diff --git a/chrome/browser/ui/views/frame/browser_frame_aura.cc b/chrome/browser/ui/views/frame/browser_frame_aura.cc
deleted file mode 100644
index f15c5bc0fe4a56fa1e6fea2d2befc7b3e8a39a97..0000000000000000000000000000000000000000
--- a/chrome/browser/ui/views/frame/browser_frame_aura.cc
+++ /dev/null
@@ -1,184 +0,0 @@
-// 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_frame_aura.h"
-
-#include "base/command_line.h"
-#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/ui/views/frame/browser_view.h"
-#include "grit/chromium_strings.h"
-#include "grit/generated_resources.h"
-#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_observer.h"
-#include "ui/base/hit_test.h"
-#include "ui/base/l10n/l10n_util.h"
-#include "ui/gfx/font.h"
-#include "ui/views/view.h"
-
-#if defined(USE_ASH)
-#include "ash/wm/window_state.h"
-#include "ash/wm/window_util.h"
-#endif
-
-using aura::Window;
-
-////////////////////////////////////////////////////////////////////////////////
-// BrowserFrameAura::WindowPropertyWatcher
-
-class BrowserFrameAura::WindowPropertyWatcher : public aura::WindowObserver {
- public:
-  explicit WindowPropertyWatcher(BrowserFrameAura* browser_frame_aura,
-                                 BrowserFrame* browser_frame)
-      : browser_frame_aura_(browser_frame_aura),
-        browser_frame_(browser_frame) {}
-
-  virtual void OnWindowPropertyChanged(aura::Window* window,
-                                       const void* key,
-                                       intptr_t old) OVERRIDE {
-    if (key != aura::client::kShowStateKey)
-      return;
-
-    ui::WindowShowState old_state = static_cast<ui::WindowShowState>(old);
-    ui::WindowShowState new_state =
-        window->GetProperty(aura::client::kShowStateKey);
-
-    // Allow the frame to be replaced when entering or exiting the maximized
-    // state.
-    if (browser_frame_->non_client_view() &&
-        browser_frame_aura_->browser_view()->browser()->is_app() &&
-        (old_state == ui::SHOW_STATE_MAXIMIZED ||
-         new_state == ui::SHOW_STATE_MAXIMIZED)) {
-      // Defer frame layout when replacing the frame. Layout will occur when the
-      // window's bounds are updated. The window maximize/restore animations
-      // clone the window's layers and rely on the subsequent layout to set
-      // the layer sizes.
-      // If the window is minimized, the frame view needs to be updated via
-      // an OnBoundsChanged event so that the frame will change its size
-      // properly.
-      browser_frame_->non_client_view()->UpdateFrame(
-          old_state == ui::SHOW_STATE_MINIMIZED);
-    }
-  }
-
-  virtual void OnWindowBoundsChanged(aura::Window* window,
-                                     const gfx::Rect& old_bounds,
-                                     const gfx::Rect& new_bounds) OVERRIDE {
-    // Don't do anything if we don't have our non-client view yet.
-    if (!browser_frame_->non_client_view())
-      return;
-
-    // If the window just moved to the top of the screen, or just moved away
-    // from it, invoke Layout() so the header size can change.
-    if ((old_bounds.y() == 0 && new_bounds.y() != 0) ||
-        (old_bounds.y() != 0 && new_bounds.y() == 0))
-      browser_frame_->non_client_view()->Layout();
-  }
-
- private:
-  BrowserFrameAura* browser_frame_aura_;
-  BrowserFrame* browser_frame_;
-
-  DISALLOW_COPY_AND_ASSIGN(WindowPropertyWatcher);
-};
-
-///////////////////////////////////////////////////////////////////////////////
-// BrowserFrameAura, public:
-
-// static
-const char BrowserFrameAura::kWindowName[] = "BrowserFrameAura";
-
-BrowserFrameAura::BrowserFrameAura(BrowserFrame* browser_frame,
-                                   BrowserView* browser_view)
-    : views::NativeWidgetAura(browser_frame),
-      browser_view_(browser_view),
-      window_property_watcher_(new WindowPropertyWatcher(this, browser_frame)) {
-  GetNativeWindow()->SetName(kWindowName);
-  GetNativeWindow()->AddObserver(window_property_watcher_.get());
-#if defined(USE_ASH)
-  if (browser_view->browser()->is_type_tabbed())
-    ash::wm::SetAnimateToFullscreen(GetNativeWindow(), false);
-
-  // Turn on auto window management if we don't need an explicit bounds.
-  // This way the requested bounds are honored.
-  if (!browser_view->browser()->bounds_overridden() &&
-      !browser_view->browser()->is_session_restore())
-    SetWindowAutoManaged();
-#endif
-#if defined(OS_CHROMEOS)
-  // For legacy reasons v1 apps (like Secure Shell) are allowed to consume keys
-  // like brightness, volume, etc. Otherwise these keys are handled by the
-  // Ash window manager.
-  if (browser_view->browser()->is_app()) {
-    ash::wm::GetWindowState(GetNativeWindow())->
-        set_can_consume_system_keys(true);
-  }
-#endif  // defined(OS_CHROMEOS)
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// BrowserFrameAura, views::NativeWidgetAura overrides:
-
-void BrowserFrameAura::OnWindowDestroying() {
-  // Window is destroyed before our destructor is called, so clean up our
-  // observer here.
-  GetNativeWindow()->RemoveObserver(window_property_watcher_.get());
-  views::NativeWidgetAura::OnWindowDestroying();
-}
-
-void BrowserFrameAura::OnWindowTargetVisibilityChanged(bool visible) {
-  if (visible) {
-    // Once the window has been shown we know the requested bounds
-    // (if provided) have been honored and we can switch on window management.
-    SetWindowAutoManaged();
-  }
-  views::NativeWidgetAura::OnWindowTargetVisibilityChanged(visible);
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// BrowserFrameAura, NativeBrowserFrame implementation:
-
-views::NativeWidget* BrowserFrameAura::AsNativeWidget() {
-  return this;
-}
-
-const views::NativeWidget* BrowserFrameAura::AsNativeWidget() const {
-  return this;
-}
-
-bool BrowserFrameAura::UsesNativeSystemMenu() const {
-  return false;
-}
-
-int BrowserFrameAura::GetMinimizeButtonOffset() const {
-  return 0;
-}
-
-void BrowserFrameAura::TabStripDisplayModeChanged() {
-}
-
-////////////////////////////////////////////////////////////////////////////////
-// BrowserFrame, public:
-
-// static
-const gfx::Font& BrowserFrame::GetTitleFont() {
-  static gfx::Font* title_font = new gfx::Font;
-  return *title_font;
-}
-
-///////////////////////////////////////////////////////////////////////////////
-// BrowserFrameAura, private:
-
-BrowserFrameAura::~BrowserFrameAura() {
-}
-
-void BrowserFrameAura::SetWindowAutoManaged() {
-#if defined(USE_ASH)
-  if (browser_view_->browser()->type() != Browser::TYPE_POPUP ||
-      browser_view_->browser()->is_app()) {
-    ash::wm::GetWindowState(GetNativeWindow())->
-        set_window_position_managed(true);
-  }
-#endif
-}