Revert of Incognito icon added to Windows taskbar jumplist.

Revert of Incognito icon added to Windows taskbar jumplist. (patchset #7 id:120001 of https://codereview.chromium.org/2660153002/ )

Reason for revert:
Broke official builder.

https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.chrome%2FGoogle_Chrome_Win%2F16181%2F%2B%2Frecipes%2Fsteps%2Fcompile%2F0%2Fstdout

[13782/39069] RC obj/chrome/chrome_initial/chrome_exe.res
FAILED: obj/chrome/chrome_initial/chrome_exe.res 
C:/b/depot_tools/python276_bin/python.exe ../../build/toolchain/win/tool_wrapper.py rc-wrapper environment.x86 rc.exe -DCHROME_MULTIPLE_DLL -DV8_DEPRECATION_WARNINGS -DUSE_AURA=1 -DNO_TCMALLOC -DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL -DOFFICIAL_BUILD -DGOOGLE_CHROME_BUILD -DENABLE_MEDIA_ROUTER=1 -D__STD_C -D_CRT_RAND_S -D_CRT_SECURE_NO_DEPRECATE -D_HAS_EXCEPTIONS=0 -D_SCL_SECURE_NO_DEPRECATE -D_ATL_NO_OPENGL -D_WINDOWS -DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DPSAPI_VERSION=1 -DWIN32 -D_SECURE_ATL -D_USING_V110_SDK71_ -DWIN32_LEAN_AND_MEAN -DNOMINMAX -D_UNICODE -DUNICODE -DNTDDI_VERSION=0x0A000000 -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -DNDEBUG -DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DCOMPILE_CONTENT_STATICALLY -I../.. -Igen -I../../breakpad/src -I../../breakpad/src -I../../third_party/boringssl/src/include /foobj/chrome/chrome_initial/chrome_exe.res ../../chrome/app/chrome_exe.rc
../../chrome/app/chrome_exe.rc(60) : error RC2135 : file not found: theme\google_chrome\win\incognito.ico


Original issue's description:
> Incognito icon added to Windows taskbar jumplist.
> 
> On Windows' taskbar's jumplist, both "New window" and "New incognito window" links have main Chrome icon.
> A rough Incognito icon is added to the repository and used instead of Chrome icon for new incognito window link.
> 
> BUG=680904
> CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.win:win10_chromium_x64_rel_ng
> 
> Review-Url: https://codereview.chromium.org/2660153002
> Cr-Commit-Position: refs/heads/master@{#457032}
> Committed: https://chromium.googlesource.com/chromium/src/+/596cbc2cc875076c361b1b77e840919a2697b67d

TBR=grt@chromium.org,elawrence@chromium.org,bettes@chromium.org,sky@chromium.org,maxwalker@chromium.org,rhalavati@chromium.org
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=680904

[Henrik Grunell, 2017-03-15 08:59:43]

The CQ bit was checked by grunell@chromium.org

[Henrik Grunell, 2017-03-15 08:59:43]

Created Revert of Incognito icon added to Windows taskbar jumplist.

[commit-bot: I haz the power, 2017-03-15 08:59:53]

CQ is trying da patch. Follow status at
 
https://chromium-cq-status.appspot.com/v2/patch-status/codereview.chromium.or...

[commit-bot: I haz the power, 2017-03-15 09:01:26]

The CQ bit was unchecked by commit-bot@chromium.org

[commit-bot: I haz the power, 2017-03-15 09:01:27]

Failed to apply patch for chrome/app/chrome_exe.rc:
While running git apply --index -p1;
  error: patch failed: chrome/app/chrome_exe.rc:57
  error: chrome/app/chrome_exe.rc: patch does not apply

Patch:       chrome/app/chrome_exe.rc
Index: chrome/app/chrome_exe.rc
diff --git a/chrome/app/chrome_exe.rc b/chrome/app/chrome_exe.rc
index
8a60d93d681f46d60521b1bc2993c8b34064e7cf..6f6f17fda0e78951d3d0a997b94373baed8bba2f
100644
--- a/chrome/app/chrome_exe.rc
+++ b/chrome/app/chrome_exe.rc
@@ -57,10 +57,8 @@
 #if defined(GOOGLE_CHROME_BUILD)
 IDR_X001_APP_LIST       ICON                   
"theme\\google_chrome\\win\\app_list.ico"
 IDR_X002_APP_LIST_SXS   ICON                   
"theme\\google_chrome\\win\\app_list_sxs.ico"
-IDR_X003_INCOGNITO      ICON                   
"theme\\google_chrome\\win\\incognito.ico"
 #else
 IDR_X001_APP_LIST       ICON                   
"theme\\chromium\\win\\app_list.ico"
-IDR_X003_INCOGNITO      ICON                   
"theme\\chromium\\win\\incognito.ico"
 #endif

[msramek, 2017-03-15 15:38:02]

msramek@chromium.org changed reviewers:
+ msramek@chromium.org

[msramek, 2017-03-15 15:38:03]

Sheriffs, FYI this can probably be closed, as the underlying issue (in the
internal repo) had been fixed here:
https://chromereviews.googleplex.com/569457014/

[Ramin Halavati, 2017-03-16 11:48:11]

On 2017/03/15 15:38:03, msramek wrote:
> Sheriffs, FYI this can probably be closed, as the underlying issue (in the
> internal repo) had been fixed here:
> https://chromereviews.googleplex.com/569457014/

This revert is created twice and the other copy is applied:
https://codereview.chromium.org/2752593004/

I close it.

[Ramin Halavati, 2017-03-16 11:48:23]

Description was changed from

==========
Revert of Incognito icon added to Windows taskbar jumplist. (patchset #7
id:120001 of https://codereview.chromium.org/2660153002/ )

Reason for revert:
Broke official builder.

https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.chrome%2FGoogle...

[13782/39069] RC obj/chrome/chrome_initial/chrome_exe.res
FAILED: obj/chrome/chrome_initial/chrome_exe.res 
C:/b/depot_tools/python276_bin/python.exe
../../build/toolchain/win/tool_wrapper.py rc-wrapper environment.x86 rc.exe
-DCHROME_MULTIPLE_DLL -DV8_DEPRECATION_WARNINGS -DUSE_AURA=1 -DNO_TCMALLOC
-DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL
-DOFFICIAL_BUILD -DGOOGLE_CHROME_BUILD -DENABLE_MEDIA_ROUTER=1 -D__STD_C
-D_CRT_RAND_S -D_CRT_SECURE_NO_DEPRECATE -D_HAS_EXCEPTIONS=0
-D_SCL_SECURE_NO_DEPRECATE -D_ATL_NO_OPENGL -D_WINDOWS
-DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DPSAPI_VERSION=1 -DWIN32 -D_SECURE_ATL
-D_USING_V110_SDK71_ -DWIN32_LEAN_AND_MEAN -DNOMINMAX -D_UNICODE -DUNICODE
-DNTDDI_VERSION=0x0A000000 -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -DNDEBUG
-DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DCOMPILE_CONTENT_STATICALLY -I../..
-Igen -I../../breakpad/src -I../../breakpad/src
-I../../third_party/boringssl/src/include
/foobj/chrome/chrome_initial/chrome_exe.res ../../chrome/app/chrome_exe.rc
../../chrome/app/chrome_exe.rc(60) : error RC2135 : file not found:
theme\google_chrome\win\incognito.ico


Original issue's description:
> Incognito icon added to Windows taskbar jumplist.
> 
> On Windows' taskbar's jumplist, both "New window" and "New incognito window"
links have main Chrome icon.
> A rough Incognito icon is added to the repository and used instead of Chrome
icon for new incognito window link.
> 
> BUG=680904
> CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.win:win10_chromium_x64_rel_ng
> 
> Review-Url: https://codereview.chromium.org/2660153002
> Cr-Commit-Position: refs/heads/master@{#457032}
> Committed:
https://chromium.googlesource.com/chromium/src/+/596cbc2cc875076c361b1b77e840...

TBR=grt@chromium.org,elawrence@chromium.org,bettes@chromium.org,sky@chromium....
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=680904
==========

to

==========
Revert of Incognito icon added to Windows taskbar jumplist. (patchset #7
id:120001 of https://codereview.chromium.org/2660153002/ )

Reason for revert:
Broke official builder.

https://luci-logdog.appspot.com/v/?s=chromium%2Fbb%2Fchromium.chrome%2FGoogle...

[13782/39069] RC obj/chrome/chrome_initial/chrome_exe.res
FAILED: obj/chrome/chrome_initial/chrome_exe.res 
C:/b/depot_tools/python276_bin/python.exe
../../build/toolchain/win/tool_wrapper.py rc-wrapper environment.x86 rc.exe
-DCHROME_MULTIPLE_DLL -DV8_DEPRECATION_WARNINGS -DUSE_AURA=1 -DNO_TCMALLOC
-DFULL_SAFE_BROWSING -DSAFE_BROWSING_CSD -DSAFE_BROWSING_DB_LOCAL
-DOFFICIAL_BUILD -DGOOGLE_CHROME_BUILD -DENABLE_MEDIA_ROUTER=1 -D__STD_C
-D_CRT_RAND_S -D_CRT_SECURE_NO_DEPRECATE -D_HAS_EXCEPTIONS=0
-D_SCL_SECURE_NO_DEPRECATE -D_ATL_NO_OPENGL -D_WINDOWS
-DCERT_CHAIN_PARA_HAS_EXTRA_FIELDS -DPSAPI_VERSION=1 -DWIN32 -D_SECURE_ATL
-D_USING_V110_SDK71_ -DWIN32_LEAN_AND_MEAN -DNOMINMAX -D_UNICODE -DUNICODE
-DNTDDI_VERSION=0x0A000000 -D_WIN32_WINNT=0x0A00 -DWINVER=0x0A00 -DNDEBUG
-DNVALGRIND -DDYNAMIC_ANNOTATIONS_ENABLED=0 -DCOMPILE_CONTENT_STATICALLY -I../..
-Igen -I../../breakpad/src -I../../breakpad/src
-I../../third_party/boringssl/src/include
/foobj/chrome/chrome_initial/chrome_exe.res ../../chrome/app/chrome_exe.rc
../../chrome/app/chrome_exe.rc(60) : error RC2135 : file not found:
theme\google_chrome\win\incognito.ico


Original issue's description:
> Incognito icon added to Windows taskbar jumplist.
> 
> On Windows' taskbar's jumplist, both "New window" and "New incognito window"
links have main Chrome icon.
> A rough Incognito icon is added to the repository and used instead of Chrome
icon for new incognito window link.
> 
> BUG=680904
> CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.win:win10_chromium_x64_rel_ng
> 
> Review-Url: https://codereview.chromium.org/2660153002
> Cr-Commit-Position: refs/heads/master@{#457032}
> Committed:
https://chromium.googlesource.com/chromium/src/+/596cbc2cc875076c361b1b77e840...

TBR=grt@chromium.org,elawrence@chromium.org,bettes@chromium.org,sky@chromium....
# Skipping CQ checks because original CL landed less than 1 days ago.
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=680904
==========