Extract Chrome-specific code from NativeAppWindowViews

apps/ui/views/native_app_window_views.cc

Index: apps/ui/views/native_app_window_views.cc
diff --git a/chrome/browser/ui/views/apps/native_app_window_views.cc b/apps/ui/views/native_app_window_views.cc
similarity index 32%
copy from chrome/browser/ui/views/apps/native_app_window_views.cc
copy to apps/ui/views/native_app_window_views.cc
index b835356a10fe1851ee6e4cad8874e5a104ab057b..f27dec2be81960cd6ceac02c264ba6e1ed1e3699 100644
--- a/chrome/browser/ui/views/apps/native_app_window_views.cc
+++ b/apps/ui/views/native_app_window_views.cc
@@ -2,209 +2,35 @@
 // 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/apps/native_app_window_views.h"
+#include "apps/ui/views/native_app_window_views.h"
 
 #include "apps/app_window.h"
-#include "apps/ui/views/app_window_frame_view.h"
-#include "base/command_line.h"
+#include "apps/ui/views/shaped_app_window_targeter.h"
 #include "base/threading/sequenced_worker_pool.h"
-#include "chrome/app/chrome_command_ids.h"
-#include "chrome/browser/app_mode/app_mode_utils.h"
-#include "chrome/browser/chrome_page_zoom.h"
-#include "chrome/browser/extensions/extension_host.h"
-#include "chrome/browser/favicon/favicon_tab_helper.h"
-#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/ash/multi_user/multi_user_context_menu.h"
-#include "chrome/browser/ui/host_desktop.h"
-#include "chrome/browser/ui/views/apps/shaped_app_window_targeter.h"
-#include "chrome/browser/ui/views/extensions/extension_keybinding_registry_views.h"
-#include "chrome/browser/ui/views/frame/taskbar_decorator.h"
-#include "chrome/browser/web_applications/web_app.h"
-#include "chrome/common/chrome_switches.h"
-#include "content/public/browser/browser_thread.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "extensions/common/draggable_region.h"
-#include "extensions/common/extension.h"
-#include "ui/base/hit_test.h"
-#include "ui/base/models/simple_menu_model.h"
-#include "ui/views/controls/menu/menu_runner.h"
+#include "third_party/skia/include/core/SkRegion.h"
+#include "ui/gfx/path.h"
 #include "ui/views/controls/webview/webview.h"
 #include "ui/views/widget/widget.h"
 #include "ui/views/window/non_client_view.h"
 
-#if defined(OS_LINUX)
-#include "chrome/browser/shell_integration_linux.h"
-#endif
-
-#if defined(USE_ASH)
-#include "ash/ash_constants.h"
-#include "ash/ash_switches.h"
-#include "ash/screen_util.h"
-#include "ash/shell.h"
-#include "ash/wm/custom_frame_view_ash.h"
-#include "ash/wm/immersive_fullscreen_controller.h"
-#include "ash/wm/panels/panel_frame_view.h"
-#include "ash/wm/window_state.h"
-#include "ash/wm/window_state_delegate.h"
-#include "ash/wm/window_state_observer.h"
-#include "chrome/browser/ui/ash/ash_util.h"
-#include "ui/aura/client/aura_constants.h"
-#include "ui/aura/client/window_tree_client.h"
-#include "ui/aura/window.h"
-#include "ui/aura/window_observer.h"
-#endif
-
 #if defined(USE_AURA)
 #include "ui/aura/window.h"
 #endif
 
 using apps::AppWindow;
 
-namespace {
-
-const int kMinPanelWidth = 100;
-const int kMinPanelHeight = 100;
-const int kDefaultPanelWidth = 200;
-const int kDefaultPanelHeight = 300;
-const int kResizeInsideBoundsSize = 5;
-const int kResizeAreaCornerSize = 16;
-
-struct AcceleratorMapping {
-  ui::KeyboardCode keycode;
-  int modifiers;
-  int command_id;
-};
-
-const AcceleratorMapping kAppWindowAcceleratorMap[] = {
-  { ui::VKEY_W, ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW },
-  { ui::VKEY_W, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_CLOSE_WINDOW },
-  { ui::VKEY_F4, ui::EF_ALT_DOWN, IDC_CLOSE_WINDOW },
-};
-
-// These accelerators will only be available in kiosk mode. These allow the
-// user to manually zoom app windows. This is only necessary in kiosk mode
-// (in normal mode, the user can zoom via the screen magnifier).
-// TODO(xiyuan): Write a test for kiosk accelerators.
-const AcceleratorMapping kAppWindowKioskAppModeAcceleratorMap[] = {
-  { ui::VKEY_OEM_MINUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS },
-  { ui::VKEY_OEM_MINUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN,
-    IDC_ZOOM_MINUS },
-  { ui::VKEY_SUBTRACT, ui::EF_CONTROL_DOWN, IDC_ZOOM_MINUS },
-  { ui::VKEY_OEM_PLUS, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS },
-  { ui::VKEY_OEM_PLUS, ui::EF_SHIFT_DOWN | ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS },
-  { ui::VKEY_ADD, ui::EF_CONTROL_DOWN, IDC_ZOOM_PLUS },
-  { ui::VKEY_0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL },
-  { ui::VKEY_NUMPAD0, ui::EF_CONTROL_DOWN, IDC_ZOOM_NORMAL },
-};
-
-void AddAcceleratorsFromMapping(const AcceleratorMapping mapping[],
-                                size_t mapping_length,
-                                std::map<ui::Accelerator, int>* accelerators) {
-  for (size_t i = 0; i < mapping_length; ++i) {
-    ui::Accelerator accelerator(mapping[i].keycode, mapping[i].modifiers);
-    (*accelerators)[accelerator] = mapping[i].command_id;
-  }
-}
-
-const std::map<ui::Accelerator, int>& GetAcceleratorTable() {
-  typedef std::map<ui::Accelerator, int> AcceleratorMap;
-  CR_DEFINE_STATIC_LOCAL(AcceleratorMap, accelerators, ());
-  if (accelerators.empty()) {
-    AddAcceleratorsFromMapping(
-        kAppWindowAcceleratorMap,
-        arraysize(kAppWindowAcceleratorMap),
-        &accelerators);
-
-    // Add accelerators for kiosk mode.
-    if (chrome::IsRunningInForcedAppMode()) {
-      AddAcceleratorsFromMapping(
-          kAppWindowKioskAppModeAcceleratorMap,
-          arraysize(kAppWindowKioskAppModeAcceleratorMap),
-          &accelerators);
-    }
-  }
-  return accelerators;
-}
-
-#if defined(USE_ASH)
-// This class handles a user's fullscreen request (Shift+F4/F4).
-class NativeAppWindowStateDelegate : public ash::wm::WindowStateDelegate,
-                                     public ash::wm::WindowStateObserver,
-                                     public aura::WindowObserver {
- public:
-  NativeAppWindowStateDelegate(AppWindow* app_window,
-                               apps::NativeAppWindow* native_app_window)
-      : app_window_(app_window),
-        window_state_(
-            ash::wm::GetWindowState(native_app_window->GetNativeWindow())) {
-    // Add a window state observer to exit fullscreen properly in case
-    // fullscreen is exited without going through AppWindow::Restore(). This
-    // is the case when exiting immersive fullscreen via the "Restore" window
-    // control.
-    // TODO(pkotwicz): This is a hack. Remove ASAP. http://crbug.com/319048
-    window_state_->AddObserver(this);
-    window_state_->window()->AddObserver(this);
-  }
-  virtual ~NativeAppWindowStateDelegate(){
-    if (window_state_) {
-      window_state_->RemoveObserver(this);
-      window_state_->window()->RemoveObserver(this);
-    }
-  }
-
- private:
-  // Overridden from ash::wm::WindowStateDelegate.
-  virtual bool ToggleFullscreen(ash::wm::WindowState* window_state) OVERRIDE {
-    // Windows which cannot be maximized should not be fullscreened.
-    DCHECK(window_state->IsFullscreen() || window_state->CanMaximize());
-    if (window_state->IsFullscreen())
-      app_window_->Restore();
-    else if (window_state->CanMaximize())
-      app_window_->OSFullscreen();
-    return true;
-  }
-
-  // Overridden from ash::wm::WindowStateObserver:
-  virtual void OnPostWindowShowTypeChange(
-      ash::wm::WindowState* window_state,
-      ash::wm::WindowShowType old_type) OVERRIDE {
-    if (!window_state->IsFullscreen() && !window_state->IsMinimized() &&
-        app_window_->GetBaseWindow()->IsFullscreenOrPending()) {
-      app_window_->Restore();
-      // Usually OnNativeWindowChanged() is called when the window bounds are
-      // changed as a result of a show type change. Because the change in show
-      // type has already occurred, we need to call OnNativeWindowChanged()
-      // explicitly.
-      app_window_->OnNativeWindowChanged();
-    }
-  }
-
-  // Overridden from aura::WindowObserver:
-  virtual void OnWindowDestroying(aura::Window* window) OVERRIDE {
-    window_state_->RemoveObserver(this);
-    window_state_->window()->RemoveObserver(this);
-    window_state_ = NULL;
-  }
-
-  // Not owned.
-  AppWindow* app_window_;
-  ash::wm::WindowState* window_state_;
-
-  DISALLOW_COPY_AND_ASSIGN(NativeAppWindowStateDelegate);
-};
-#endif  // USE_ASH
-
-}  // namespace
-
 NativeAppWindowViews::NativeAppWindowViews()
-    : web_view_(NULL),
+    : app_window_(NULL),
+      web_view_(NULL),
       window_(NULL),
-      is_fullscreen_(false),
-      weak_ptr_factory_(this) {
-}
+      frameless_(false),
+      transparent_background_(false),
+      resizable_(false) {}
 
 void NativeAppWindowViews::Init(apps::AppWindow* app_window,
                                 const AppWindow::CreateParams& create_params) {
@@ -212,20 +38,10 @@ void NativeAppWindowViews::Init(apps::AppWindow* app_window,
   frameless_ = create_params.frame == AppWindow::FRAME_NONE;
   transparent_background_ = create_params.transparent_background;
   resizable_ = create_params.resizable;
-  Observe(web_contents());
+  Observe(app_window_->web_contents());
 
   window_ = new views::Widget;
-  if (create_params.window_type == AppWindow::WINDOW_TYPE_PANEL ||
-      create_params.window_type == AppWindow::WINDOW_TYPE_V1_PANEL) {
-    InitializePanelWindow(create_params);
-  } else {
-    InitializeDefaultWindow(create_params);
-  }
-  extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(
-      Profile::FromBrowserContext(browser_context()),
-      window_->GetFocusManager(),
-      extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
-      app_window_));
+  InitializeWindow(app_window, create_params);
 
   OnViewWasResized();
   window_->AddObserver(this);
@@ -235,174 +51,16 @@ NativeAppWindowViews::~NativeAppWindowViews() {
   web_view_->SetWebContents(NULL);
 }
 
-void NativeAppWindowViews::OnBeforeWidgetInit(
-    views::Widget::InitParams* init_params,
-    views::Widget* widget) {}
-
-void NativeAppWindowViews::InitializeDefaultWindow(
-    const AppWindow::CreateParams& create_params) {
-  std::string app_name =
-      web_app::GenerateApplicationNameFromExtensionId(extension()->id());
-
+void NativeAppWindowViews::InitializeWindow(
+    apps::AppWindow* app_window,
+    const apps::AppWindow::CreateParams& create_params) {
+  // Stub implementation. See also ChromeNativeAppWindowViews.
   views::Widget::InitParams init_params(views::Widget::InitParams::TYPE_WINDOW);
   init_params.delegate = this;
-  init_params.remove_standard_frame = ShouldUseChromeStyleFrame();
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  // On Linux, remove the standard frame. Instead, we will use CustomFrameView
-  // to draw a native-like frame.
-  // TODO(mgiuca): Remove this during fix for http://crbug.com/322256.
-  init_params.remove_standard_frame = true;
-#endif
-  init_params.use_system_default_icon = true;
-  // TODO(erg): Conceptually, these are toplevel windows, but we theoretically
-  // could plumb context through to here in some cases.
   init_params.top_level = true;
-  if (create_params.transparent_background)
-    init_params.opacity = views::Widget::InitParams::TRANSLUCENT_WINDOW;
   init_params.keep_on_top = create_params.always_on_top;
-  gfx::Rect window_bounds = create_params.bounds;
-  bool position_specified =
-      window_bounds.x() != INT_MIN && window_bounds.y() != INT_MIN;
-  if (position_specified && !window_bounds.IsEmpty())
-    init_params.bounds = window_bounds;
-
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  // Set up a custom WM_CLASS for app windows. This allows task switchers in
-  // X11 environments to distinguish them from main browser windows.
-  init_params.wm_class_name = web_app::GetWMClassFromAppName(app_name);
-  init_params.wm_class_class = ShellIntegrationLinux::GetProgramClassName();
-  const char kX11WindowRoleApp[] = "app";
-  init_params.wm_role_name = std::string(kX11WindowRoleApp);
-#endif
-
-  OnBeforeWidgetInit(&init_params, window_);
   window_->Init(init_params);
-
-  gfx::Rect adjusted_bounds = window_bounds;
-  adjusted_bounds.Inset(-GetFrameInsets());
-  // Center window if no position was specified.
-  if (!position_specified)
-    window_->CenterWindow(adjusted_bounds.size());
-  else if (!adjusted_bounds.IsEmpty() && adjusted_bounds != window_bounds)
-    window_->SetBounds(adjusted_bounds);
-
-  // Register accelarators supported by app windows.
-  // TODO(jeremya/stevenjb): should these be registered for panels too?
-  views::FocusManager* focus_manager = GetFocusManager();
-  const std::map<ui::Accelerator, int>& accelerator_table =
-      GetAcceleratorTable();
-  const bool is_kiosk_app_mode = chrome::IsRunningInForcedAppMode();
-
-  // Ensures that kiosk mode accelerators are enabled when in kiosk mode (to be
-  // future proof). This is needed because GetAcceleratorTable() uses a static
-  // to store data and only checks kiosk mode once. If a platform app is
-  // launched before kiosk mode starts, the kiosk accelerators will not be
-  // registered. This DCHECK catches the case.
-  DCHECK(!is_kiosk_app_mode ||
-         accelerator_table.size() ==
-             arraysize(kAppWindowAcceleratorMap) +
-                 arraysize(kAppWindowKioskAppModeAcceleratorMap));
-
-  for (std::map<ui::Accelerator, int>::const_iterator iter =
-           accelerator_table.begin();
-       iter != accelerator_table.end(); ++iter) {
-    if (is_kiosk_app_mode && !chrome::IsCommandAllowedInAppMode(iter->second))
-      continue;
-
-    focus_manager->RegisterAccelerator(
-        iter->first, ui::AcceleratorManager::kNormalPriority, this);
-  }
-}
-
-void NativeAppWindowViews::InitializePanelWindow(
-    const AppWindow::CreateParams& create_params) {
-  views::Widget::InitParams params(views::Widget::InitParams::TYPE_PANEL);
-  params.delegate = this;
-
-  preferred_size_ = gfx::Size(create_params.bounds.width(),
-                              create_params.bounds.height());
-  if (preferred_size_.width() == 0)
-    preferred_size_.set_width(kDefaultPanelWidth);
-  else if (preferred_size_.width() < kMinPanelWidth)
-    preferred_size_.set_width(kMinPanelWidth);
-
-  if (preferred_size_.height() == 0)
-    preferred_size_.set_height(kDefaultPanelHeight);
-  else if (preferred_size_.height() < kMinPanelHeight)
-    preferred_size_.set_height(kMinPanelHeight);
-#if defined(USE_ASH)
-  if (ash::Shell::HasInstance()) {
-    // Open a new panel on the target root.
-    aura::Window* target = ash::Shell::GetTargetRootWindow();
-    params.bounds = ash::ScreenUtil::ConvertRectToScreen(
-        target, gfx::Rect(preferred_size_));
-  } else {
-    params.bounds = gfx::Rect(preferred_size_);
-  }
-#else
-  params.bounds = gfx::Rect(preferred_size_);
-#endif
-  // TODO(erg): Conceptually, these are toplevel windows, but we theoretically
-  // could plumb context through to here in some cases.
-  params.top_level = true;
-  window_->Init(params);
-  window_->set_focus_on_creation(create_params.focused);
-
-#if defined(USE_ASH)
-  if (create_params.state == ui::SHOW_STATE_DETACHED) {
-    gfx::Rect window_bounds(create_params.bounds.x(),
-                            create_params.bounds.y(),
-                            preferred_size_.width(),
-                            preferred_size_.height());
-    aura::Window* native_window = GetNativeWindow();
-    ash::wm::GetWindowState(native_window)->set_panel_attached(false);
-    aura::client::ParentWindowWithContext(native_window,
-                                          native_window->GetRootWindow(),
-                                          native_window->GetBoundsInScreen());
-    window_->SetBounds(window_bounds);
-  }
-#else
-  // TODO(stevenjb): NativeAppWindow panels need to be implemented for other
-  // platforms.
-#endif
-}
-
-bool NativeAppWindowViews::ShouldUseChromeStyleFrame() const {
-  if (frameless_)
-    return true;
-
-#if defined(OS_LINUX) && !defined(OS_CHROMEOS)
-  // Linux always uses native style frames.
-  return false;
-#endif
-
-  return !CommandLine::ForCurrentProcess()->HasSwitch(
-      switches::kAppsUseNativeFrame);
-}
-
-apps::AppWindowFrameView* NativeAppWindowViews::CreateAppWindowFrameView() {
-  // By default the user can resize the window from slightly inside the bounds.
-  int resize_inside_bounds_size = kResizeInsideBoundsSize;
-  int resize_outside_bounds_size = 0;
-  int resize_outside_scale_for_touch = 1;
-  int resize_area_corner_size = kResizeAreaCornerSize;
-#if defined(USE_ASH)
-  // For Aura windows on the Ash desktop the sizes are different and the user
-  // can resize the window from slightly outside the bounds as well.
-  if (chrome::IsNativeWindowInAsh(window_->GetNativeWindow())) {
-    resize_inside_bounds_size = ash::kResizeInsideBoundsSize;
-    resize_outside_bounds_size = ash::kResizeOutsideBoundsSize;
-    resize_outside_scale_for_touch = ash::kResizeOutsideBoundsScaleForTouch;
-    resize_area_corner_size = ash::kResizeAreaCornerSize;
-  }
-#endif
-  apps::AppWindowFrameView* frame_view = new apps::AppWindowFrameView(this);
-  frame_view->Init(window_,
-                   resize_inside_bounds_size,
-                   resize_outside_bounds_size,
-                   resize_outside_scale_for_touch,
-                   resize_area_corner_size);
-  return frame_view;
+  window_->CenterWindow(create_params.bounds.size());
 }
 
 // ui::BaseWindow implementation.
@@ -432,41 +90,11 @@ gfx::Rect NativeAppWindowViews::GetRestoredBounds() const {
 }
 
 ui::WindowShowState NativeAppWindowViews::GetRestoredState() const {
+  // Stub implementation. See also ChromeNativeAppWindowViews.
   if (IsMaximized())
     return ui::SHOW_STATE_MAXIMIZED;
-  if (IsFullscreen()) {
-#if defined(USE_ASH)
-    if (immersive_fullscreen_controller_.get() &&
-        immersive_fullscreen_controller_->IsEnabled()) {
-      // Restore windows which were previously in immersive fullscreen to
-      // maximized. Restoring the window to a different fullscreen type
-      // makes for a bad experience.
-      return ui::SHOW_STATE_MAXIMIZED;
-    }
-#endif
+  if (IsFullscreen())
     return ui::SHOW_STATE_FULLSCREEN;
-  }
-#if defined(USE_ASH)
-  // Use kRestoreShowStateKey in case a window is minimized/hidden.
-  ui::WindowShowState restore_state =
-      window_->GetNativeWindow()->GetProperty(
-          aura::client::kRestoreShowStateKey);
-  // Whitelist states to return so that invalid and transient states
-  // are not saved and used to restore windows when they are recreated.
-  switch (restore_state) {
-    case ui::SHOW_STATE_NORMAL:
-    case ui::SHOW_STATE_MAXIMIZED:
-    case ui::SHOW_STATE_FULLSCREEN:
-    case ui::SHOW_STATE_DETACHED:
-      return restore_state;
-
-    case ui::SHOW_STATE_DEFAULT:
-    case ui::SHOW_STATE_MINIMIZED:
-    case ui::SHOW_STATE_INACTIVE:
-    case ui::SHOW_STATE_END:
-      return ui::SHOW_STATE_NORMAL;
-  }
-#endif
   return ui::SHOW_STATE_NORMAL;
 }
 
@@ -479,13 +107,13 @@ void NativeAppWindowViews::Show() {
     window_->Activate();
     return;
   }
-
   window_->Show();
 }
 
 void NativeAppWindowViews::ShowInactive() {
   if (window_->IsVisible())
     return;
+
   window_->ShowInactive();
 }
 
@@ -526,50 +154,14 @@ void NativeAppWindowViews::FlashFrame(bool flash) {
 }
 
 bool NativeAppWindowViews::IsAlwaysOnTop() const {
-  if (app_window_->window_type_is_panel()) {
-#if defined(USE_ASH)
-    return ash::wm::GetWindowState(window_->GetNativeWindow())->
-        panel_attached();
-#else
-    return true;
-#endif
-  } else {
-    return window_->IsAlwaysOnTop();
-  }
+  // Stub implementation. See also ChromeNativeAppWindowViews.
+  return window_->IsAlwaysOnTop();
 }
 
 void NativeAppWindowViews::SetAlwaysOnTop(bool always_on_top) {
   window_->SetAlwaysOnTop(always_on_top);
 }
 
-void NativeAppWindowViews::ShowContextMenuForView(
-    views::View* source,
-    const gfx::Point& p,
-    ui::MenuSourceType source_type) {
-#if defined(USE_ASH) & defined(OS_CHROMEOS)
-  scoped_ptr<ui::MenuModel> model =
-      CreateMultiUserContextMenu(app_window_->GetNativeWindow());
-  if (!model.get())
-    return;
-
-  // Only show context menu if point is in caption.
-  gfx::Point point_in_view_coords(p);
-  views::View::ConvertPointFromScreen(window_->non_client_view(),
-                                      &point_in_view_coords);
-  int hit_test = window_->non_client_view()->NonClientHitTest(
-      point_in_view_coords);
-  if (hit_test == HTCAPTION) {
-    menu_runner_.reset(new views::MenuRunner(model.get()));
-    if (menu_runner_->RunMenuAt(source->GetWidget(), NULL,
-          gfx::Rect(p, gfx::Size(0,0)), views::MenuItemView::TOPLEFT,
-          source_type,
-          views::MenuRunner::HAS_MNEMONICS | views::MenuRunner::CONTEXT_MENU) ==
-        views::MenuRunner::MENU_DELETED)
-      return;
-  }
-#endif
-}
-
 gfx::NativeView NativeAppWindowViews::GetHostView() const {
   return window_->GetNativeView();
 }
@@ -593,8 +185,6 @@ void NativeAppWindowViews::RemoveObserver(
   observer_list_.RemoveObserver(observer);
 }
 
-// Private method. TODO(stevenjb): Move this below InitializePanelWindow()
-// to match declaration order.
 void NativeAppWindowViews::OnViewWasResized() {
   FOR_EACH_OBSERVER(web_modal::ModalDialogHostObserver,
                     observer_list_,
@@ -628,26 +218,6 @@ bool NativeAppWindowViews::ShouldShowWindowTitle() const {
   return app_window_->window_type() == AppWindow::WINDOW_TYPE_V1_PANEL;
 }
 
-gfx::ImageSkia NativeAppWindowViews::GetWindowAppIcon() {
-  gfx::Image app_icon = app_window_->app_icon();
-  if (app_icon.IsEmpty())
-    return GetWindowIcon();
-  else
-    return *app_icon.ToImageSkia();
-}
-
-gfx::ImageSkia NativeAppWindowViews::GetWindowIcon() {
-  content::WebContents* web_contents = app_window_->web_contents();
-  if (web_contents) {
-    FaviconTabHelper* favicon_tab_helper =
-        FaviconTabHelper::FromWebContents(web_contents);
-    gfx::Image app_icon = favicon_tab_helper->GetFavicon();
-    if (!app_icon.IsEmpty())
-      return *app_icon.ToImageSkia();
-  }
-  return gfx::ImageSkia();
-}
-
 bool NativeAppWindowViews::ShouldShowWindowIcon() const {
   return app_window_->window_type() == AppWindow::WINDOW_TYPE_V1_PANEL;
 }
@@ -675,49 +245,6 @@ views::View* NativeAppWindowViews::GetContentsView() {
   return this;
 }
 
-views::NonClientFrameView* NativeAppWindowViews::CreateNonClientFrameView(
-    views::Widget* widget) {
-#if defined(USE_ASH)
-  if (chrome::IsNativeViewInAsh(widget->GetNativeView())) {
-    // Set the delegate now because CustomFrameViewAsh sets the
-    // WindowStateDelegate if one is not already set.
-    ash::wm::GetWindowState(GetNativeWindow())->SetDelegate(
-        scoped_ptr<ash::wm::WindowStateDelegate>(
-            new NativeAppWindowStateDelegate(app_window_, this)).Pass());
-
-    if (app_window_->window_type_is_panel()) {
-      ash::PanelFrameView::FrameType frame_type = frameless_ ?
-          ash::PanelFrameView::FRAME_NONE : ash::PanelFrameView::FRAME_ASH;
-      views::NonClientFrameView* frame_view =
-          new ash::PanelFrameView(widget, frame_type);
-      frame_view->set_context_menu_controller(this);
-      return frame_view;
-    }
-
-    if (!frameless_) {
-      ash::CustomFrameViewAsh* custom_frame_view =
-          new ash::CustomFrameViewAsh(widget);
-#if defined(OS_CHROMEOS)
-      // Non-frameless app windows can be put into immersive fullscreen.
-      // TODO(pkotwicz): Investigate if immersive fullscreen can be enabled for
-      // Windows Ash.
-      if (ash::switches::UseImmersiveFullscreenForAllWindows()) {
-        immersive_fullscreen_controller_.reset(
-            new ash::ImmersiveFullscreenController());
-        custom_frame_view->InitImmersiveFullscreenControllerForView(
-            immersive_fullscreen_controller_.get());
-      }
-#endif
-      custom_frame_view->GetHeaderView()->set_context_menu_controller(this);
-      return custom_frame_view;
-    }
-  }
-#endif
-  if (ShouldUseChromeStyleFrame())
-    return CreateAppWindowFrameView();
-  return views::WidgetDelegateView::CreateNonClientFrameView(widget);
-}
-
 bool NativeAppWindowViews::WidgetHasHitTestMask() const {
   return shape_ != NULL;
 }
@@ -791,16 +318,10 @@ void NativeAppWindowViews::ViewHierarchyChanged(
   if (details.is_add && details.child == this) {
     web_view_ = new views::WebView(NULL);
     AddChildView(web_view_);
-    web_view_->SetWebContents(web_contents());
+    web_view_->SetWebContents(app_window_->web_contents());
   }
 }
 
-gfx::Size NativeAppWindowViews::GetPreferredSize() {
-  if (!preferred_size_.IsEmpty())
-    return preferred_size_;
-  return views::View::GetPreferredSize();
-}
-
 gfx::Size NativeAppWindowViews::GetMinimumSize() {
   return app_window_->size_constraints().GetMinimumSize();
 }
@@ -813,80 +334,21 @@ void NativeAppWindowViews::OnFocus() {
   web_view_->RequestFocus();
 }
 
-bool NativeAppWindowViews::AcceleratorPressed(
-    const ui::Accelerator& accelerator) {
-  const std::map<ui::Accelerator, int>& accelerator_table =
-      GetAcceleratorTable();
-  std::map<ui::Accelerator, int>::const_iterator iter =
-      accelerator_table.find(accelerator);
-  DCHECK(iter != accelerator_table.end());
-  int command_id = iter->second;
-  switch (command_id) {
-    case IDC_CLOSE_WINDOW:
-      Close();
-      return true;
-    case IDC_ZOOM_MINUS:
-      chrome_page_zoom::Zoom(web_view_->GetWebContents(),
-                             content::PAGE_ZOOM_OUT);
-      return true;
-    case IDC_ZOOM_NORMAL:
-      chrome_page_zoom::Zoom(web_view_->GetWebContents(),
-                             content::PAGE_ZOOM_RESET);
-      return true;
-    case IDC_ZOOM_PLUS:
-      chrome_page_zoom::Zoom(web_view_->GetWebContents(),
-                             content::PAGE_ZOOM_IN);
-      return true;
-    default:
-      NOTREACHED() << "Unknown accelerator sent to app window.";
-  }
-  return false;
-}
-
 // NativeAppWindow implementation.
 
 void NativeAppWindowViews::SetFullscreen(int fullscreen_types) {
-  // Fullscreen not supported by panels.
-  if (app_window_->window_type_is_panel())
-    return;
-  is_fullscreen_ = (fullscreen_types != AppWindow::FULLSCREEN_TYPE_NONE);
-  window_->SetFullscreen(is_fullscreen_);
-
-#if defined(USE_ASH)
-  if (immersive_fullscreen_controller_.get()) {
-    // |immersive_fullscreen_controller_| should only be set if immersive
-    // fullscreen is the fullscreen type used by the OS.
-    immersive_fullscreen_controller_->SetEnabled(
-        ash::ImmersiveFullscreenController::WINDOW_TYPE_PACKAGED_APP,
-        (fullscreen_types & AppWindow::FULLSCREEN_TYPE_OS) != 0);
-    // Autohide the shelf instead of hiding the shelf completely when only in
-    // OS fullscreen.
-    ash::wm::WindowState* window_state =
-        ash::wm::GetWindowState(window_->GetNativeWindow());
-    window_state->set_hide_shelf_when_fullscreen(fullscreen_types !=
-                                                 AppWindow::FULLSCREEN_TYPE_OS);
-    DCHECK(ash::Shell::HasInstance());
-    ash::Shell::GetInstance()->UpdateShelfVisibility();
-  }
-#endif
-
-  // TODO(jeremya) we need to call RenderViewHost::ExitFullscreen() if we
-  // ever drop the window out of fullscreen in response to something that
-  // wasn't the app calling webkitCancelFullScreen().
+  // Stub implementation. See also ChromeNativeAppWindowViews.
+  window_->SetFullscreen(fullscreen_types != AppWindow::FULLSCREEN_TYPE_NONE);
 }
 
 bool NativeAppWindowViews::IsFullscreenOrPending() const {
-  return is_fullscreen_;
+  // Stub implementation. See also ChromeNativeAppWindowViews.
+  return window_->IsFullscreen();
 }
 
 bool NativeAppWindowViews::IsDetached() const {
-  if (!app_window_->window_type_is_panel())
-    return false;
-#if defined(USE_ASH)
-  return !ash::wm::GetWindowState(window_->GetNativeWindow())->panel_attached();
-#else
+  // Stub implementation. See also ChromeNativeAppWindowViews.
   return false;
-#endif
 }
 
 void NativeAppWindowViews::UpdateWindowIcon() {
@@ -898,19 +360,7 @@ void NativeAppWindowViews::UpdateWindowTitle() {
 }
 
 void NativeAppWindowViews::UpdateBadgeIcon() {
-  const gfx::Image* icon = NULL;
-  if (!app_window_->badge_icon().IsEmpty()) {
-    icon = &app_window_->badge_icon();
-    // chrome::DrawTaskbarDecoration can do interesting things with non-square
-    // bitmaps.
-    // TODO(benwells): Refactor chrome::DrawTaskbarDecoration to not be avatar
-    // specific, and lift this restriction.
-    if (icon->Width() != icon->Height()) {
-      LOG(ERROR) << "Attempt to set a non-square badge; request ignored.";
-      return;
-    }
-  }
-  chrome::DrawTaskbarDecoration(GetNativeWindow(), icon);
+  // Stub implementation. See also ChromeNativeAppWindowViews.
 }
 
 void NativeAppWindowViews::UpdateDraggableRegions(