Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(244)

Issues Search
    My Issues | Starred     Open | Closed | All

Issue 1106963003: Re-sync ios/web with downstream version (Closed)

Created:
5 years, 8 months ago by stuartmorgan
Modified:
5 years, 8 months ago
CC:
chromium-reviews
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Target Ref:
refs/pending/heads/master
Project:
chromium
Visibility:
Public.

Description

Re-sync ios/web with downstream version In-flight CLs that landed downstream during the upstreaming of these files resulted in drift; this re-syncs the files to the latest versions. BUG=464810 Committed: https://crrev.com/aea81ada3a7947aae790d8c3c84f8b1e4257eee1 Cr-Commit-Position: refs/heads/master@{#327059}

Patch Set 1 #

Patch Set 2 : Add forgotten file #

Unified diffs Side-by-side diffs Delta from patch set Stats (+363 lines, -334 lines) Patch
M ios/web/ios_web.gyp View 2 chunks +1 line, -1 line 0 comments Download
M ios/web/navigation/crw_session_controller.mm View 10 chunks +34 lines, -31 lines 0 comments Download
M ios/web/navigation/crw_session_controller_unittest.mm View 5 chunks +15 lines, -11 lines 0 comments Download
M ios/web/navigation/crw_session_entry.h View 2 chunks +12 lines, -29 lines 0 comments Download
M ios/web/navigation/crw_session_entry.mm View 7 chunks +18 lines, -113 lines 0 comments Download
M ios/web/navigation/crw_session_entry_unittest.mm View 11 chunks +48 lines, -117 lines 0 comments Download
M ios/web/navigation/navigation_item_impl.h View 4 chunks +40 lines, -1 line 0 comments Download
M ios/web/navigation/navigation_item_impl.mm View 4 chunks +88 lines, -6 lines 0 comments Download
M ios/web/navigation/navigation_item_impl_unittest.mm View 3 chunks +81 lines, -1 line 0 comments Download
M ios/web/public/DEPS View 1 chunk +0 lines, -4 lines 0 comments Download
M ios/web/public/navigation_item.h View 2 chunks +21 lines, -0 lines 0 comments Download
M ios/web/public/test/web_test_util.h View 1 chunk +1 line, -1 line 0 comments Download
A + ios/web/public/web_view_util.h View 1 2 chunks +3 lines, -3 lines 0 comments Download
D ios/web/web_view_util.h View 1 chunk +0 lines, -15 lines 0 comments Download
M ios/web/web_view_util.mm View 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 7 (2 generated)
stuartmorgan
5 years, 8 months ago (2015-04-27 14:36:04 UTC) #2
Eugene But (OOO till 7-30)
lgtm
5 years, 8 months ago (2015-04-27 15:04:35 UTC) #3
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/1106963003/20001
5 years, 8 months ago (2015-04-27 16:49:24 UTC) #5
commit-bot: I haz the power
Committed patchset #2 (id:20001)
5 years, 8 months ago (2015-04-27 16:57:51 UTC) #6
commit-bot: I haz the power
5 years, 8 months ago (2015-04-27 16:59:07 UTC) #7
Message was sent while issue was closed. 
Patchset 2 (id:??) landed as
https://crrev.com/aea81ada3a7947aae790d8c3c84f8b1e4257eee1
Cr-Commit-Position: refs/heads/master@{#327059}

Powered by Google App Engine
This is Rietveld 408576698