chrome/browser/web_applications/web_app_mac.mm - Issue 212273002: Move UpdateShortcutInfoAndIconForApp from web_app_ui to web_app

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/web_applications/web_app_mac.mm

Issue 212273002: Move UpdateShortcutInfoAndIconForApp from web_app_ui to web_app (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Fix build on linux Created 6 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:

Index: chrome/browser/web_applications/web_app_mac.mm

diff --git a/chrome/browser/web_applications/web_app_mac.mm b/chrome/browser/web_applications/web_app_mac.mm

index 3edfc4ec51655ad0f940ae0f5630dda3b01811b7..903f243f22ea4881c78bc99592d7a909b53b9200 100644

--- a/chrome/browser/web_applications/web_app_mac.mm

+++ b/chrome/browser/web_applications/web_app_mac.mm

@@ -26,7 +26,6 @@

#include "base/strings/utf_string_conversions.h"

#import "chrome/browser/mac/dock.h"

#include "chrome/browser/profiles/profile.h"

-#include "chrome/browser/ui/web_applications/web_app_ui.h"

#include "chrome/common/chrome_constants.h"

#include "chrome/common/chrome_paths.h"

#include "chrome/common/chrome_switches.h"

@@ -98,7 +97,7 @@ bool AddGfxImageToIconFamily(IconFamilyHandle icon_family,

const gfx::Image& image) {

// When called via ShowCreateChromeAppShortcutsDialog the ImageFamily will

// have all the representations desired here for mac, from the kDesiredSizes

- // array in web_app_ui.cc.

+ // array in web_app.cc.

SkBitmap bitmap = image.AsBitmap();

if (bitmap.config() != SkBitmap::kARGB_8888_Config ||

bitmap.width() != bitmap.height()) {