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

trunk/src/chrome/browser/ui/gtk/apps/native_app_window_gtk.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/ui/gtk/apps/native_app_window_gtk.h"
 
 #include <gdk/gdkx.h>
 #include <vector>
 
 #include "base/message_loop/message_pump_gtk.h"
@@ skipping 128 matching lines @@
       GdkWindow* window = gtk_widget_get_window(GTK_WIDGET(window_));
       gdk_window_add_filter(window,
                             &NativeAppWindowGtk::OnXEventThunk,
                             this);
       is_x_event_listened_ = true;
     }
   }
 
   // Add the keybinding registry.
   extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryGtk(
-      shell_window_->profile(),
+      Profile::FromBrowserContext(shell_window_->browser_context()),
       window_,
       extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,
       shell_window_));
 
   ui::ActiveWindowWatcherX::AddObserver(this);
 }
 
 NativeAppWindowGtk::~NativeAppWindowGtk() {
   ui::ActiveWindowWatcherX::RemoveObserver(this);
   if (is_x_event_listened_) {
@@ skipping 457 matching lines @@
   // In that case, |content_thinks_its_fullscreen_| will be cleared, but we
   // will fall back to |IsFullscreen| which will soon have the correct state.
   return content_thinks_its_fullscreen_ || IsFullscreen();
 }
 
 bool NativeAppWindowGtk::IsDetached() const {
   return false;
 }
 
 void NativeAppWindowGtk::UpdateWindowIcon() {
-  Profile* profile = shell_window_->profile();
+  Profile* profile =
+      Profile::FromBrowserContext(shell_window_->browser_context());
   gfx::Image app_icon = shell_window_->app_icon();
   if (!app_icon.IsEmpty())
     gtk_util::SetWindowIcon(window_, profile, app_icon.ToGdkPixbuf());
   else
     gtk_util::SetWindowIcon(window_, profile);
 }
 
 void NativeAppWindowGtk::UpdateWindowTitle() {
   base::string16 title = shell_window_->GetTitle();
   gtk_window_set_title(window_, base::UTF16ToUTF8(title).c_str());
@@ skipping 77 matching lines @@
     hints_mask |= GDK_HINT_MAX_SIZE;
   }
   if (hints_mask) {
     gtk_window_set_geometry_hints(
         window_,
         GTK_WIDGET(window_),
         &hints,
         static_cast<GdkWindowHints>(hints_mask));
   }
 }