Revert 215753 "Move native_app_window code to apps areas"

trunk/src/chrome/browser/extensions/api/tabs/ash_panel_contents.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/extensions/api/tabs/ash_panel_contents.h"
 
-#include "apps/native_app_window.h"
 #include "base/values.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
 #include "chrome/browser/extensions/api/tabs/windows_event_router.h"
 #include "chrome/browser/extensions/extension_tab_util.h"
 #include "chrome/browser/extensions/window_controller_list.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/browser/sessions/session_tab_helper.h"
+#include "chrome/browser/ui/extensions/native_app_window.h"
 #include "chrome/common/extensions/extension.h"
 #include "chrome/common/extensions/extension_messages.h"
 #include "content/public/browser/site_instance.h"
 #include "content/public/browser/web_contents.h"
 #include "ui/gfx/image/image.h"
 
 using apps::ShellWindow;
-using apps::NativeAppWindow;
 
 // AshPanelWindowController ----------------------------------------------------
 
 // This class enables a ShellWindow instance to be accessed (to a limited
 // extent) via the chrome.windows and chrome.tabs API. This is a temporary
 // bridge to support instantiating ShellWindows from v1 apps, specifically
 // for creating Panels in Ash. See crbug.com/160645.
 class AshPanelWindowController : public extensions::WindowController {
  public:
   AshPanelWindowController(ShellWindow* window, Profile* profile);
@@ skipping 201 matching lines @@
 
 content::WebContents* AshPanelContents::GetAssociatedWebContents() const {
   return web_contents_.get();
 }
 
 void AshPanelContents::OnRequest(
     const ExtensionHostMsg_Request_Params& params) {
   extension_function_dispatcher_->Dispatch(
       params, web_contents_->GetRenderViewHost());
 }