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

trunk/src/chrome/browser/ui/views/apps/native_app_window_views.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 CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
 #define CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_
 
 #include "apps/shell_window.h"
 #include "apps/ui/native_app_window.h"
 #include "base/observer_list.h"
@@ skipping 11 matching lines @@
 #include "chrome/browser/shell_integration.h"
 #endif
 
 #if defined(USE_ASH)
 namespace ash {
 class ImmersiveFullscreenController;
 }
 #endif
 
 class ExtensionKeybindingRegistryViews;
-class Profile;
 
 namespace apps {
 class ShellWindowFrameView;
 }
 
 namespace content {
+class BrowserContext;
 class RenderViewHost;
 class WebContents;
 }
 
 namespace extensions {
 class Extension;
 }
 
 namespace ui {
 class MenuModel;
@@ skipping 20 matching lines @@
  protected:
   // Called before views::Widget::Init() to allow subclasses to customize
   // the InitParams that would be passed.
   virtual void OnBeforeWidgetInit(views::Widget::InitParams* init_params,
                                   views::Widget* widget);
 
   // ui::BaseWindow implementation that subclasses may override.
   virtual void Show() OVERRIDE;
   virtual void Activate() OVERRIDE;
 
-  Profile* profile() { return shell_window_->profile(); }
+  content::BrowserContext* browser_context() {
+    return shell_window_->browser_context();
+  }
+
   const extensions::Extension* extension() {
     return shell_window_->extension();
   }
 
  private:
   friend class ShapedAppWindowTargeterTest;
 
   void InitializeDefaultWindow(
       const apps::ShellWindow::CreateParams& create_params);
   void InitializePanelWindow(
@@ skipping 150 matching lines @@
 
   base::WeakPtrFactory<NativeAppWindowViews> weak_ptr_factory_;
 
   // Used to show the system menu.
   scoped_ptr<views::MenuRunner> menu_runner_;
 
   DISALLOW_COPY_AND_ASSIGN(NativeAppWindowViews);
 };
 
 #endif  // CHROME_BROWSER_UI_VIEWS_APPS_NATIVE_APP_WINDOW_VIEWS_H_