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

Issue 3163014: Merge 55103, 55656, and 55909 (Closed)

Created:
10 years, 4 months ago by Aaron Boodman
Modified:
9 years, 6 months ago
Reviewers:
Cris Neckar
CC:
chromium-reviews, cbentzel+watch_chromium.org, ben+cc_chromium.org, Erik does not do reviews, brettw-cc_chromium.org, Aaron Boodman, darin-cc_chromium.org, Paweł Hajdan Jr., pam+watch_chromium.org
Visibility:
Public.

Description

Merge 55103, 55656, and 55909. This is a hand-merge of the above three files. I've verified the applicable unit tests and browser tests pass. BUG=45876 Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=56215

Patch Set 1 #

Unified diffs Side-by-side diffs Delta from patch set Stats (+331 lines, -115 lines) Patch
M chrome/browser/extensions/app_process_apitest.cc View 2 chunks +28 lines, -24 lines 0 comments Download
M chrome/browser/extensions/extension_browsertests_misc.cc View 3 chunks +43 lines, -0 lines 0 comments Download
M chrome/browser/extensions/extension_install_ui.cc View 2 chunks +11 lines, -9 lines 0 comments Download
M chrome/browser/extensions/extension_protocols.cc View 2 chunks +45 lines, -7 lines 0 comments Download
M chrome/browser/net/chrome_url_request_context.h View 3 chunks +17 lines, -4 lines 0 comments Download
M chrome/browser/net/chrome_url_request_context.cc View 3 chunks +17 lines, -0 lines 0 comments Download
M chrome/browser/profile.cc View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/browser/renderer_host/render_view_host.h View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/common/extensions/extension.h View 2 chunks +2 lines, -1 line 0 comments Download
M chrome/common/extensions/extension.cc View 6 chunks +55 lines, -40 lines 0 comments Download
M chrome/common/extensions/extension_constants.h View 1 chunk +1 line, -0 lines 0 comments Download
M chrome/common/extensions/extension_constants.cc View 1 chunk +2 lines, -0 lines 0 comments Download
M chrome/common/extensions/extension_manifests_unittest.cc View 1 chunk +7 lines, -0 lines 0 comments Download
M chrome/common/extensions/extension_unittest.cc View 2 chunks +30 lines, -28 lines 0 comments Download
M chrome/common/extensions/url_pattern.h View 2 chunks +16 lines, -0 lines 0 comments Download
MM chrome/test/data/extensions/api_test/app_process/manifest.json View 1 chunk +0 lines, -2 lines 0 comments Download
A chrome/test/data/extensions/manifest_tests/disallow_hybrid_1.json View 1 chunk +18 lines, -0 lines 0 comments Download
A chrome/test/data/extensions/manifest_tests/disallow_hybrid_2.json View 1 chunk +18 lines, -0 lines 0 comments Download
A chrome/test/data/extensions/origin_privileges/extension/manifest.json View 1 chunk +7 lines, -0 lines 0 comments Download
A chrome/test/data/extensions/origin_privileges/extension2/index.html View 1 chunk +3 lines, -0 lines 0 comments Download
A chrome/test/data/extensions/origin_privileges/extension2/manifest.json View 1 chunk +6 lines, -0 lines 0 comments Download
A chrome/test/data/extensions/origin_privileges/index.html View 1 chunk +3 lines, -0 lines 0 comments Download

Messages

Total messages: 2 (0 generated)
Aaron Boodman
10 years, 4 months ago (2010-08-14 00:40:07 UTC) #1
Cris Neckar
10 years, 4 months ago (2010-08-16 18:17:38 UTC) #2
LGTM

Powered by Google App Engine
This is Rietveld 408576698