Extract NativeAppWindow from src/extensions

athena/extensions/athena_app_window_client_base.cc

Index: athena/extensions/athena_app_window_client_base.cc
diff --git a/athena/extensions/athena_app_window_client_base.cc b/athena/extensions/athena_app_window_client_base.cc
index 5b6fab569ada0bc5bf0237490f4bbd19c6440c40..d53ced7b025ae7eecc52e37253514a35f99e02e7 100644
--- a/athena/extensions/athena_app_window_client_base.cc
+++ b/athena/extensions/athena_app_window_client_base.cc
@@ -7,6 +7,7 @@
 #include "athena/activity/public/activity_factory.h"
 #include "athena/activity/public/activity_manager.h"
 #include "athena/extensions/athena_native_app_window_views.h"
+#include "extensions/browser/app_window/app_window.h"
 #include "extensions/common/extension.h"
 
 namespace athena {
@@ -17,9 +18,10 @@ AthenaAppWindowClientBase::AthenaAppWindowClientBase() {
 AthenaAppWindowClientBase::~AthenaAppWindowClientBase() {
 }
 
-extensions::NativeAppWindow* AthenaAppWindowClientBase::CreateNativeAppWindow(
+native_app_window::NativeAppWindow*
+AthenaAppWindowClientBase::CreateNativeAppWindow(
     extensions::AppWindow* app_window,
-    const extensions::AppWindow::CreateParams& params) {
+    const native_app_window::AppWindowCreateParams& params) {
   AthenaNativeAppWindowViews* native_window = new AthenaNativeAppWindowViews;
   native_window->Init(app_window, params);
   ActivityFactory::Get()->CreateAppActivity(app_window,