Revert 215753 "Move native_app_window code to apps areas"

trunk/src/apps/shell_window.h

 // 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.
 
 #ifndef APPS_SHELL_WINDOW_H_
 #define APPS_SHELL_WINDOW_H_
 
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "chrome/browser/extensions/extension_icon_image.h"
 #include "chrome/browser/extensions/extension_keybinding_registry.h"
 #include "chrome/browser/sessions/session_id.h"
 #include "components/web_modal/web_contents_modal_dialog_manager_delegate.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/web_contents_delegate.h"
 #include "content/public/common/console_message_level.h"
 #include "ui/base/ui_base_types.h"  // WindowShowState
 #include "ui/gfx/image/image.h"
 #include "ui/gfx/rect.h"
 
 class GURL;
 class Profile;
+class NativeAppWindow;
 class SkRegion;
 
 namespace content {
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
 class PlatformAppBrowserTest;
 class WindowController;
 
 struct DraggableRegion;
 }
 
 namespace ui {
 class BaseWindow;
 }
 
 namespace apps {
 
-class NativeAppWindow;
-
 // Manages the web contents for Shell Windows. The implementation for this
 // class should create and maintain the WebContents for the window, and handle
 // any message passing between the web contents and the extension system or
 // native window.
 class ShellWindowContents {
  public:
   ShellWindowContents() {}
   virtual ~ShellWindowContents() {}
 
   // Called to initialize the WebContents, before the app window is created.
@@ skipping 68 matching lines @@
     // If true, the window will be focused on creation. Defaults to true.
     bool focused;
   };
 
   class Delegate {
    public:
     virtual ~Delegate();
 
     // General initialization.
     virtual void InitWebContents(content::WebContents* web_contents) = 0;
-    virtual NativeAppWindow* CreateNativeAppWindow(
-        ShellWindow* window,
-        const CreateParams& params) = 0;
 
     // Link handling.
     virtual content::WebContents* OpenURLFromTab(
         Profile* profile,
         content::WebContents* source,
         const content::OpenURLParams& params) = 0;
     virtual void AddNewContents(Profile* profile,
                                 content::WebContents* new_contents,
                                 WindowOpenDisposition disposition,
                                 const gfx::Rect& initial_pos,
@@ skipping 231 matching lines @@
   bool fullscreen_for_window_api_;
   // Fullscreen entered by HTML requestFullscreen.
   bool fullscreen_for_tab_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindow);
 };
 
 }  // namespace apps
 
 #endif  // APPS_SHELL_WINDOW_H_