Revert 215753 "Move native_app_window code to apps areas"

trunk/src/chrome/browser/extensions/api/app_window/app_window_api.cc

 // 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/extensions/api/app_window/app_window_api.h"
 
 #include "apps/app_window_contents.h"
-#include "apps/native_app_window.h"
 #include "apps/shell_window.h"
 #include "base/command_line.h"
 #include "base/time/time.h"
 #include "base/values.h"
 #include "chrome/browser/app_mode/app_mode_utils.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/devtools/devtools_window.h"
 #include "chrome/browser/extensions/shell_window_registry.h"
 #include "chrome/browser/extensions/window_controller.h"
 #include "chrome/browser/ui/apps/chrome_shell_window_delegate.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/common/extensions/api/app_window.h"
 #include "chrome/common/extensions/features/feature.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
 #include "extensions/common/switches.h"
 #include "ui/base/ui_base_types.h"
@@ skipping 258 matching lines @@
     gfx::Size size = ash::Shell::GetPrimaryRootWindow()->bounds().size();
     if (size.width() > create_params.maximum_size.width() ||
         size.height() > create_params.maximum_size.height())
       force_maximize = false;
   }
  #endif
 
   if (force_maximize)
     create_params.state = ui::SHOW_STATE_MAXIMIZED;
 
-  ShellWindow* shell_window = new ShellWindow(profile(),
-                                              new ChromeShellWindowDelegate(),
-                                              GetExtension());
+  ShellWindow* shell_window = new ShellWindow(
+      profile(),
+      new chrome::ChromeShellWindowDelegate(),
+      GetExtension());
   shell_window->Init(url,
                      new apps::AppWindowContents(shell_window),
                      create_params);
 
   if (chrome::IsRunningInForcedAppMode())
     shell_window->Fullscreen();
 
   content::RenderViewHost* created_view =
       shell_window->web_contents()->GetRenderViewHost();
   int view_id = MSG_ROUTING_NONE;
@@ skipping 11 matching lines @@
   if (ShellWindowRegistry::Get(profile())->HadDevToolsAttached(created_view)) {
     new DevToolsRestorer(this, created_view);
     return true;
   }
 
   SendResponse(true);
   return true;
 }
 
 }  // namespace extensions