chrome/browser/shell_integration.h - Issue 12881003: ShortcutInfo::favicon is now a gfx::ImageFamily instead of gfx::Image.

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: chrome/browser/shell_integration.h

Issue 12881003: ShortcutInfo::favicon is now a gfx::ImageFamily instead of gfx::Image. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: web_app_mac: Fix compile error (no Mac to test it on so I'm building in the dark). Created 7 years, 9 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/browser/shell_integration.h

diff --git a/chrome/browser/shell_integration.h b/chrome/browser/shell_integration.h

index 0a365fb6ce328b0b29d6db1848af000e568a410c..ea8cd55508adc4ab66da9149e8e92f8e82ddbc17 100644

--- a/chrome/browser/shell_integration.h

+++ b/chrome/browser/shell_integration.h

@@ -12,7 +12,7 @@

#include "base/memory/ref_counted.h"

#include "base/string16.h"

#include "googleurl/src/gurl.h"

-#include "ui/gfx/image/image.h"

+#include "ui/gfx/icon_family.h"

class CommandLine;

@@ -101,7 +101,7 @@ class ShellIntegration {

string16 title;

string16 description;

base::FilePath extension_path;

- gfx::Image favicon;

+ gfx::IconFamily favicon;

base::FilePath profile_path;

};

« no previous file with comments | « no previous file | chrome/browser/shell_integration_linux.cc » ('j') | chrome/browser/ui/views/create_application_shortcut_view.cc » ('J')