Issue 10914160: Manually merging remaining Win8 changes.

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

Issue 10914160: Manually merging remaining Win8 changes. (Closed)

Created:
8 years, 3 months ago by robertshield

Modified:
8 years, 3 months ago

Reviewers:
cpu_(ooo_6.6-7.5), ananta

CC:
chromium-reviews, chrome-win8-eng_google.com

Base URL:
svn://svn.chromium.org/chrome/trunk/src

Visibility:
Public.

Manually merging remaining Win8 changes. BUG=127799 TEST=NONE Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=155592

Created: 8 years, 3 months ago

Download [raw] [tar.bz2]

	Unified diffs	Side-by-side diffs	Stats (+283 lines, -96 lines)			Patch
M	win8/delegate_execute/command_execute_impl.cc	View	3 chunks	+10 lines, -2 lines	0 comments	Download
M	win8/delegate_execute/delegate_execute.cc	View	2 chunks	+58 lines, -52 lines	0 comments	Download
M	win8/delegate_execute/delegate_execute_operation.h	View	1 chunk	+35 lines, -9 lines	0 comments	Download
M	win8/delegate_execute/delegate_execute_operation.cc	View	1 chunk	+30 lines, -14 lines	0 comments	Download
M	win8/metro_driver/chrome_app_view.cc	View	6 chunks	+132 lines, -3 lines	0 comments	Download
M	win8/metro_driver/chrome_url_launch_handler.cc	View	2 chunks	+11 lines, -15 lines	0 comments	Download
M	win8/metro_driver/metro_driver.gyp	View	1 chunk	+1 line, -0 lines	0 comments	Download
M	win8/metro_driver/secondary_tile.cc	View	2 chunks	+6 lines, -1 line	0 comments	Download

Total messages: 5 (0 generated)

robertshield

This pulls the latest src-internal changes from metro_driver@r28535 and delegate_execute@r28522. It's a manual merge, so ...

8 years, 3 months ago (2012-09-07 22:12:19 UTC) #1

commit-bot: I haz the power

CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/robertshield@chromium.org/10914160/1

8 years, 3 months ago (2012-09-08 14:29:44 UTC) #4

Change committed as 155592