chrome/app/chrome_exe.rc - Issue 2660153002: Incognito icon added to Windows taskbar jumplist.

Side by Side Diff: chrome/app/chrome_exe.rc

Issue 2660153002: Incognito icon added to Windows taskbar jumplist. (Closed)

Patch Set: Resource file modified for branded build. Created 3 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:

« no previous file with comments | « no previous file | chrome/app/theme/chromium/win/incognito.ico » ('j') | no next file with comments »

OLD	NEW
1 // Microsoft Visual C++ generated resource script.	1 // Microsoft Visual C++ generated resource script.

2 //	2 //

3 #include "chrome_exe_resource.h"	3 #include "chrome_exe_resource.h"

4	4

5 #define APSTUDIO_READONLY_SYMBOLS	5 #define APSTUDIO_READONLY_SYMBOLS

6 /////////////////////////////////////////////////////////////////////////////	6 /////////////////////////////////////////////////////////////////////////////

7 //	7 //

8 // Generated from the TEXTINCLUDE 2 resource.	8 // Generated from the TEXTINCLUDE 2 resource.

9 //	9 //

10 #define APSTUDIO_HIDDEN_SYMBOLS	10 #define APSTUDIO_HIDDEN_SYMBOLS

(...skipping 39 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
50 #endif	50 #endif

51	51

52 // Start a naming scheme to keep icons in order. A leading X is used to keep	52 // Start a naming scheme to keep icons in order. A leading X is used to keep

53 // the name alphabetically after IDR_SXS. The maximum of the number that follows	53 // the name alphabetically after IDR_SXS. The maximum of the number that follows

54 // should be incremented when a new icon is added. The icon indices in	54 // should be incremented when a new icon is added. The icon indices in

55 // chrome_icon_resources_win.cc should also be updated.	55 // chrome_icon_resources_win.cc should also be updated.

56	56

57 #if defined(GOOGLE_CHROME_BUILD)	57 #if defined(GOOGLE_CHROME_BUILD)

58 IDR_X001_APP_LIST ICON "theme\\google_chrome\\win\\app_ list.ico"	58 IDR_X001_APP_LIST ICON "theme\\google_chrome\\win\\app_ list.ico"

59 IDR_X002_APP_LIST_SXS ICON "theme\\google_chrome\\win\\app_ list_sxs.ico"	59 IDR_X002_APP_LIST_SXS ICON "theme\\google_chrome\\win\\app_ list_sxs.ico"

	60 // TODO(rhalavati@): To be changed before landing this CL.
	grt (UTC plus 2) 2017/02/01 13:28:50 remove comment? remove comment? Ramin Halavati 2017/02/01 13:44:13 Done. Show quoted text On 2017/02/01 13:28:50, grt (UTC plus 1) wrote: > remove comment? Done.
	61 IDR_X003_INCOGNITO ICON "theme\\google_chrome\\win\\inco gnito.ico"
	grt (UTC plus 2) 2017/02/01 13:28:50 do you have a CL that adds this file? is the asset do you have a CL that adds this file? is the asset different between Chromium and Google Chrome? Ramin Halavati 2017/02/01 13:44:13 I am waiting for the icon to be verified by bettes Show quoted text On 2017/02/01 13:28:50, grt (UTC plus 1) wrote: > do you have a CL that adds this file? is the asset different between Chromium > and Google Chrome? I am waiting for the icon to be verified by bettes@. In case similar icons would be used, should I include it from Chromium directory or put a new one here? grt (UTC plus 2) 2017/02/01 21:01:20 If the icon is truly identical, maybe it should be Show quoted text On 2017/02/01 13:44:13, Ramin Halavati wrote: > On 2017/02/01 13:28:50, grt (UTC plus 1) wrote: > > do you have a CL that adds this file? is the asset different between Chromium > > and Google Chrome? > > I am waiting for the icon to be verified by bettes@. In case similar icons would > be used, should I include it from Chromium directory or put a new one here? If the icon is truly identical, maybe it should be in neither the chromium nor google_chrome directories. Do we have cross-brand icons in the tree anywhere? Otherwise, if keeping the icons in brand-specific directories makes sense, take care to land the google_chrome icon before landing this CL. Otherwise you may break Google Chrome-branded builds (file not found when running rc.exe on this file).
60 #else	62 #else

61 IDR_X001_APP_LIST ICON "theme\\chromium\\win\\app_list. ico"	63 IDR_X001_APP_LIST ICON "theme\\chromium\\win\\app_list. ico"

	64 IDR_X003_INCOGNITO ICON "theme\\chromium\\win\\incognito .ico"

62 #endif	65 #endif

63	66

64	67

65 /////////////////////////////////////////////////////////////////////////////	68 /////////////////////////////////////////////////////////////////////////////

66 //	69 //

67 // GOOGLEUPDATEAPPLICATIONCOMMANDS is a "well-known" marker resource defined	70 // GOOGLEUPDATEAPPLICATIONCOMMANDS is a "well-known" marker resource defined

68 // by Omaha. Executables must both be signed by Google and contain the marker	71 // by Omaha. Executables must both be signed by Google and contain the marker

69 // in order to expose application commands.	72 // in order to expose application commands.

70 //	73 //

71 #define IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP 1	74 #define IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP 1

72	75

73 IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP GOOGLEUPDATEAPPLICATIONCOMMANDS { 1L }	76 IDR_GOOGLE_UPDATE_APP_COMMANDS_MARKUP GOOGLEUPDATEAPPLICATIONCOMMANDS { 1L }

74	77

75	78

76 #endif // English (U.S.) resources	79 #endif // English (U.S.) resources

77 /////////////////////////////////////////////////////////////////////////////	80 /////////////////////////////////////////////////////////////////////////////

OLD	NEW