chrome/browser/win/app_icon.cc - Issue 2098713003: Moved a bunch of win-specific files to the new win folder in chrome/browser

Side by Side Diff

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

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

Side by Side Diff: chrome/browser/win/app_icon.cc

Issue 2098713003: Moved a bunch of win-specific files to the new win folder in chrome/browser (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebase Created 4 years, 5 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 unified diff | Download patch

« no previous file with comments | « chrome/browser/win/app_icon.h ('k') | chrome/browser/win/browser_util.h » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2011 The Chromium Authors. All rights reserved.

2 // Use of this source code is governed by a BSD-style license that can be	2 // Use of this source code is governed by a BSD-style license that can be

3 // found in the LICENSE file.	3 // found in the LICENSE file.

4	4

5 #include "chrome/browser/app_icon_win.h"	5 #include "chrome/browser/win/app_icon.h"

6	6

7 #include "chrome/app/chrome_dll_resource.h"	7 #include "chrome/app/chrome_dll_resource.h"

8 #include "chrome/common/chrome_constants.h"	8 #include "chrome/common/chrome_constants.h"

9 #include "third_party/skia/include/core/SkBitmap.h"	9 #include "third_party/skia/include/core/SkBitmap.h"

10 #include "ui/gfx/geometry/size.h"	10 #include "ui/gfx/geometry/size.h"

11 #include "ui/gfx/icon_util.h"	11 #include "ui/gfx/icon_util.h"

12 #include "ui/gfx/image/image_family.h"	12 #include "ui/gfx/image/image_family.h"

13	13

14 #if defined(GOOGLE_CHROME_BUILD)	14 #if defined(GOOGLE_CHROME_BUILD)

15 #include "chrome/installer/util/install_util.h"	15 #include "chrome/installer/util/install_util.h"

(...skipping 48 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
64 // IDs). If chrome.dll is not loaded, we are probably in a unit test, so fall	64 // IDs). If chrome.dll is not loaded, we are probably in a unit test, so fall

65 // back to getting the icon from the current module (assuming it is	65 // back to getting the icon from the current module (assuming it is

66 // unit_tests.exe, that has the same resource IDs as chrome.dll).	66 // unit_tests.exe, that has the same resource IDs as chrome.dll).

67 HMODULE module = GetModuleHandle(chrome::kBrowserResourcesDll);	67 HMODULE module = GetModuleHandle(chrome::kBrowserResourcesDll);

68 if (!module)	68 if (!module)

69 module = GetModuleHandle(nullptr);	69 module = GetModuleHandle(nullptr);

70 DCHECK(module);	70 DCHECK(module);

71	71

72 return IconUtil::CreateImageFamilyFromIconResource(module, icon_id);	72 return IconUtil::CreateImageFamilyFromIconResource(module, icon_id);

73 }	73 }

OLD	NEW