trunk/src/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc - Issue 163913004: Revert 250826 "Remove Profile dependency from apps::ShellWindow"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: trunk/src/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc

Issue 163913004: Revert 250826 "Remove Profile dependency from apps::ShellWindow" (Closed) Base URL: svn://svn.chromium.org/chrome/

Patch Set: Created 6 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: trunk/src/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc

===================================================================

--- trunk/src/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc (revision 251093)

+++ trunk/src/chrome/browser/ui/gtk/apps/native_app_window_gtk.cc (working copy)

@@ -146,7 +146,7 @@

// Add the keybinding registry.

extension_keybinding_registry_.reset(new ExtensionKeybindingRegistryGtk(

- Profile::FromBrowserContext(shell_window_->browser_context()),

+ shell_window_->profile(),

window_,

extensions::ExtensionKeybindingRegistry::PLATFORM_APPS_ONLY,

shell_window_));

@@ -624,8 +624,7 @@

}

void NativeAppWindowGtk::UpdateWindowIcon() {

- Profile* profile =

- Profile::FromBrowserContext(shell_window_->browser_context());

+ Profile* profile = shell_window_->profile();

gfx::Image app_icon = shell_window_->app_icon();

if (!app_icon.IsEmpty())

gtk_util::SetWindowIcon(window_, profile, app_icon.ToGdkPixbuf());