Revert 251094 "Revert 250826 "Remove Profile dependency from app..."

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/browser/web_contents_observer.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 SkRegion;
 
 namespace base {
 class DictionaryValue;
 }
 
 namespace content {
+class BrowserContext;
 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.
-  virtual void Initialize(Profile* profile, const GURL& url) = 0;
+  virtual void Initialize(content::BrowserContext* context,
+                          const GURL& url) = 0;
 
   // Called to load the contents, after the app window is created.
   virtual void LoadContents(int32 creator_process_id) = 0;
 
   // Called when the native window changes.
   virtual void NativeWindowChanged(NativeAppWindow* native_app_window) = 0;
 
   // Called when the native window closes.
   virtual void NativeWindowClosed() = 0;
 
@@ skipping 122 matching lines @@
     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::BrowserContext* context,
         content::WebContents* source,
         const content::OpenURLParams& params) = 0;
-    virtual void AddNewContents(Profile* profile,
+    virtual void AddNewContents(content::BrowserContext* context,
                                 content::WebContents* new_contents,
                                 WindowOpenDisposition disposition,
                                 const gfx::Rect& initial_pos,
                                 bool user_gesture,
                                 bool* was_blocked) = 0;
 
     // Feature support.
     virtual content::ColorChooser* ShowColorChooser(
         content::WebContents* web_contents,
         SkColor initial_color) = 0;
@@ skipping 14 matching lines @@
 
   // Convert draggable regions in raw format to SkRegion format. Caller is
   // responsible for deleting the returned SkRegion instance.
   static SkRegion* RawDraggableRegionsToSkRegion(
       const std::vector<extensions::DraggableRegion>& regions);
 
   // The constructor and Init methods are public for constructing a ShellWindow
   // with a non-standard render interface (e.g. v1 apps using Ash Panels).
   // Normally ShellWindow::Create should be used.
   // The constructed shell window takes ownership of |delegate|.
-  ShellWindow(Profile* profile,
+  ShellWindow(content::BrowserContext* context,
               Delegate* delegate,
               const extensions::Extension* extension);
 
   // Initializes the render interface, web contents, and native window.
   // |shell_window_contents| will become owned by ShellWindow.
   void Init(const GURL& url,
             ShellWindowContents* shell_window_contents,
             const CreateParams& params);
 
 
   const std::string& window_key() const { return window_key_; }
   const SessionID& session_id() const { return session_id_; }
   const extensions::Extension* extension() const { return extension_; }
   const std::string& extension_id() const { return extension_id_; }
   content::WebContents* web_contents() const;
   WindowType window_type() const { return window_type_; }
   bool window_type_is_panel() const {
     return (window_type_ == WINDOW_TYPE_PANEL ||
             window_type_ == WINDOW_TYPE_V1_PANEL);
   }
-  Profile* profile() const { return profile_; }
+  content::BrowserContext* browser_context() const { return browser_context_; }
   const gfx::Image& app_icon() const { return app_icon_; }
   const GURL& app_icon_url() const { return app_icon_url_; }
   const gfx::Image& badge_icon() const { return badge_icon_; }
   const GURL& badge_icon_url() const { return badge_icon_url_; }
 
   NativeAppWindow* GetBaseWindow();
   gfx::NativeWindow GetNativeWindow();
 
   // Returns the bounds that should be reported to the renderer.
   gfx::Rect GetClientBounds() const;
@@ skipping 207 matching lines @@
   void DidDownloadFavicon(int id,
                           int http_status_code,
                           const GURL& image_url,
                           const std::vector<SkBitmap>& bitmaps,
                           const std::vector<gfx::Size>& original_bitmap_sizes);
 
   // extensions::IconImage::Observer implementation.
   virtual void OnExtensionIconImageChanged(
       extensions::IconImage* image) OVERRIDE;
 
-  Profile* profile_;  // weak pointer - owned by ProfileManager.
+  // The browser context with which this window is associated. ShellWindow does
+  // not own this object.
+  content::BrowserContext* browser_context_;
+
   // weak pointer - owned by ExtensionService.
   const extensions::Extension* extension_;
   const std::string extension_id_;
 
   // Identifier that is used when saving and restoring geometry for this
   // window.
   std::string window_key_;
 
   const SessionID session_id_;
   WindowType window_type_;
@@ skipping 46 matching lines @@
   // reinstated when the window exits fullscreen and moves away from the
   // taskbar.
   bool cached_always_on_top_;
 
   DISALLOW_COPY_AND_ASSIGN(ShellWindow);
 };
 
 }  // namespace apps
 
 #endif  // APPS_SHELL_WINDOW_H_