| Index: chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
|
| diff --git a/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc b/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
|
| index a35491febd32b061c53dba0075fd5f629b9dc20e..0b5c695faaea7b70cf0c6893c1e4aae4f0c14f15 100644
|
| --- a/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
|
| +++ b/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc
|
| @@ -1,4 +1,4 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2014 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.
|
|
|
| @@ -146,7 +146,7 @@ NativeAppWindowGtk::NativeAppWindowGtk(ShellWindow* shell_window,
|
|
|
| // 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_));
|
| @@ -624,7 +624,8 @@ bool NativeAppWindowGtk::IsDetached() const {
|
| }
|
|
|
| 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());
|
|
|