Moved CreateNativeAppWindow from AppWindow::Delegate to AppsClient.

chrome/browser/ui/apps/chrome_apps_client.cc

 // Copyright 2013 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/apps/chrome_apps_client.h"
+#include "chrome/browser/ui/apps/chrome_apps_client.h"
 
 #include "apps/app_window.h"
 #include "base/memory/singleton.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "extensions/common/extension.h"
 
 // TODO(jamescook): We probably shouldn't compile this class at all on Android.
 // See http://crbug.com/343612
 #if !defined(OS_ANDROID)
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
-#include "chrome/browser/ui/apps/chrome_app_window_delegate.h"
 #endif
 
-ChromeAppsClient::ChromeAppsClient() {}
+ChromeAppsClient::ChromeAppsClient() {
+}
 
-ChromeAppsClient::~ChromeAppsClient() {}
+ChromeAppsClient::~ChromeAppsClient() {
+}
 
 // static
 ChromeAppsClient* ChromeAppsClient::GetInstance() {
   return Singleton<ChromeAppsClient,
                    LeakySingletonTraits<ChromeAppsClient> >::get();
 }
 
 std::vector<content::BrowserContext*>
-    ChromeAppsClient::GetLoadedBrowserContexts() {
+ChromeAppsClient::GetLoadedBrowserContexts() {
   std::vector<Profile*> profiles =
       g_browser_process->profile_manager()->GetLoadedProfiles();
   return std::vector<content::BrowserContext*>(profiles.begin(),
                                                profiles.end());
 }
 
 apps::AppWindow* ChromeAppsClient::CreateAppWindow(
     content::BrowserContext* context,
     const extensions::Extension* extension) {
 #if defined(OS_ANDROID)
   return NULL;
 #else
-  return new apps::AppWindow(
-      context, new ChromeAppDelegate, new ChromeAppWindowDelegate, extension);
+  return new apps::AppWindow(context, new ChromeAppDelegate, extension);
 #endif
 }
 
+apps::NativeAppWindow* ChromeAppsClient::CreateNativeAppWindow(
+    apps::AppWindow* window,
+    const apps::AppWindow::CreateParams& params) {
+#if defined(OS_ANDROID)
+  return NULL;
+#else
+  return CreateNativeAppWindowImpl(window, params);
+#endif
+}
+
 void ChromeAppsClient::IncrementKeepAliveCount() {
 #if !defined(OS_ANDROID)
   chrome::IncrementKeepAliveCount();
 #endif
 }
 
 void ChromeAppsClient::DecrementKeepAliveCount() {
 #if !defined(OS_ANDROID)
   chrome::DecrementKeepAliveCount();
 #endif
 }