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

trunk/src/chrome/browser/ui/views/apps/native_app_window_views.cc

Index: trunk/src/chrome/browser/ui/views/apps/native_app_window_views.cc
===================================================================
--- trunk/src/chrome/browser/ui/views/apps/native_app_window_views.cc	(revision 251111)
+++ trunk/src/chrome/browser/ui/views/apps/native_app_window_views.cc	(working copy)
@@ -266,12 +266,11 @@
   } else {
     InitializeDefaultWindow(create_params);
   }
-  extension_keybinding_registry_.reset(
-      new ExtensionKeybindingRegistryViews(
-          profile(),
-          window_->GetFocusManager(),
-          extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
-          shell_window_));
+  extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryViews(
+      Profile::FromBrowserContext(browser_context()),
+      window_->GetFocusManager(),
+      extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
+      shell_window_));
 
   OnViewWasResized();
   window_->AddObserver(this);
@@ -362,11 +361,15 @@
 #if defined(OS_WIN)
   base::string16 app_name_wide = base::UTF8ToWide(app_name);
   HWND hwnd = GetNativeAppWindowHWND();
-  ui::win::SetAppIdForWindow(ShellIntegration::GetAppModelIdForProfile(
-      app_name_wide, profile()->GetPath()), hwnd);
+  ui::win::SetAppIdForWindow(
+      ShellIntegration::GetAppModelIdForProfile(
+          app_name_wide,
+          Profile::FromBrowserContext(browser_context())->GetPath()),
+      hwnd);
 
   web_app::UpdateShortcutInfoAndIconForApp(
-      *extension(), profile(),
+      *extension(),
+      Profile::FromBrowserContext(browser_context()),
       base::Bind(&NativeAppWindowViews::OnShortcutInfoLoaded,
                  weak_ptr_factory_.GetWeakPtr()));
 #endif