Extract NativeAppWindow from src/extensions

chrome/browser/ui/views/apps/chrome_native_app_window_views_win.cc

 // Copyright 2014 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/apps/chrome_native_app_window_views_win.h"
 
 #include "apps/ui/views/app_window_frame_view.h"
 #include "ash/shell.h"
 #include "base/command_line.h"
 #include "base/files/file_util.h"
@@ skipping 17 matching lines @@
 #include "extensions/browser/app_window/app_window.h"
 #include "extensions/browser/app_window/app_window_registry.h"
 #include "extensions/browser/extension_util.h"
 #include "extensions/common/extension.h"
 #include "ui/aura/remote_window_tree_host_win.h"
 #include "ui/base/l10n/l10n_util.h"
 #include "ui/base/win/shell.h"
 #include "ui/views/widget/desktop_aura/desktop_native_widget_aura.h"
 #include "ui/views/win/hwnd_util.h"
 
-ChromeNativeAppWindowViewsWin::ChromeNativeAppWindowViewsWin()
-    : glass_frame_view_(NULL), weak_ptr_factory_(this) {
+ChromeNativeAppWindowViewsWin::ChromeNativeAppWindowViewsWin(
+    extensions::AppWindow* app_window)
+    : ChromeNativeAppWindowViews(app_window),
+      glass_frame_view_(NULL),
+      weak_ptr_factory_(this) {
 }
 
 void ChromeNativeAppWindowViewsWin::ActivateParentDesktopIfNecessary() {
   // Only switching into Ash from Native is supported. Tearing the user out of
   // Metro mode can only be done by launching a process from Metro mode itself.
   // This is done for launching apps, but not regular activations.
   if (IsRunningInAsh() &&
       chrome::GetActiveDesktop() == chrome::HOST_DESKTOP_TYPE_NATIVE) {
     chrome::ActivateMetroChrome();
   }
@@ skipping 19 matching lines @@
   // The default views / Aura implementation will remove this if we are using
   // frameless or colored windows, so we put it back here.
   HWND hwnd = GetNativeAppWindowHWND();
   int current_style = ::GetWindowLong(hwnd, GWL_STYLE);
   ::SetWindowLong(hwnd, GWL_STYLE, current_style | WS_CAPTION);
 }
 
 void ChromeNativeAppWindowViewsWin::OnBeforeWidgetInit(
     views::Widget::InitParams* init_params,
     views::Widget* widget) {
-  content::BrowserContext* browser_context = app_window()->browser_context();
-  std::string extension_id = app_window()->extension_id();
+  content::BrowserContext* browser_context = app_window()->GetBrowserContext();
+  std::string extension_id = extension_app_window()->extension_id();
   // If an app has any existing windows, ensure new ones are created on the
   // same desktop.
   extensions::AppWindow* any_existing_window =
       extensions::AppWindowRegistry::Get(browser_context)
           ->GetCurrentAppWindowForApp(extension_id);
   chrome::HostDesktopType desktop_type;
   if (any_existing_window) {
     desktop_type = chrome::GetHostDesktopTypeForNativeWindow(
         any_existing_window->GetNativeWindow());
   } else {
@@ skipping 15 matching lines @@
 
 void ChromeNativeAppWindowViewsWin::InitializeDefaultWindow(
     const extensions::AppWindow::CreateParams& create_params) {
   ChromeNativeAppWindowViews::InitializeDefaultWindow(create_params);
 
   // Remaining initialization is for Windows shell integration, which doesn't
   // apply to app windows in Ash.
   if (IsRunningInAsh())
     return;
 
-  const extensions::Extension* extension = app_window()->GetExtension();
+  const extensions::Extension* extension =
+      extension_app_window()->GetExtension();
   if (!extension)
     return;
 
   std::string app_name =
       web_app::GenerateApplicationNameFromExtensionId(extension->id());
   base::string16 app_name_wide = base::UTF8ToWide(app_name);
   HWND hwnd = GetNativeAppWindowHWND();
   Profile* profile =
-      Profile::FromBrowserContext(app_window()->browser_context());
+      Profile::FromBrowserContext(app_window()->GetBrowserContext());
   app_model_id_ =
       ShellIntegration::GetAppModelIdForProfile(app_name_wide,
                                                 profile->GetPath());
   ui::win::SetAppIdForWindow(app_model_id_, hwnd);
   web_app::UpdateRelaunchDetailsForApp(profile, extension, hwnd);
 
   if (!create_params.alpha_enabled)
     EnsureCaptionStyleSet();
   UpdateShelfMenu();
 }
@@ skipping 22 matching lines @@
   if (!JumpListUpdater::IsEnabled() || IsRunningInAsh())
     return;
 
   // Currently the only option is related to ephemeral apps, so avoid updating
   // the app's jump list when the feature is not enabled.
   if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kEnableEphemeralApps)) {
     return;
   }
 
-  const extensions::Extension* extension = app_window()->GetExtension();
+  const extensions::Extension* extension =
+      extension_app_window()->GetExtension();
   if (!extension)
     return;
 
   // For the icon resources.
   base::FilePath chrome_path;
   if (!PathService::Get(base::FILE_EXE, &chrome_path))
     return;
 
   DCHECK(!app_model_id_.empty());
 
   JumpListUpdater jumplist_updater(app_model_id_);
   if (!jumplist_updater.BeginUpdate())
     return;
 
   // Add item to install ephemeral apps.
   if (extensions::util::IsEphemeralApp(extension->id(),
-                                       app_window()->browser_context())) {
+                                       app_window()->GetBrowserContext())) {
     scoped_refptr<ShellLinkItem> link(new ShellLinkItem());
     link->set_title(l10n_util::GetStringUTF16(IDS_APP_INSTALL_TITLE));
     link->set_icon(chrome_path.value(),
                    icon_resources::kInstallPackagedAppIndex);
     ShellIntegration::AppendProfileArgs(
-        app_window()->browser_context()->GetPath(), link->GetCommandLine());
+        app_window()->GetBrowserContext()->GetPath(), link->GetCommandLine());
     link->GetCommandLine()->AppendSwitchASCII(switches::kInstallFromWebstore,
                                               extension->id());
 
     ShellLinkItemList items;
     items.push_back(link);
     jumplist_updater.AddTasks(items);
   }
 
   // Note that an empty jumplist must still be committed to clear all items.
   jumplist_updater.CommitUpdate();
 }