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

Issue 839663003: Upstream partner customizations. (Closed)

Created:
5 years, 11 months ago by newt (away)
Modified:
5 years, 11 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

Upstream partner customizations. This upstreams code to support partner customizations, i.e. partner bookmarks, disabling incognito mode, and setting a homepage. BUG=444675 NOTRY=true Committed: https://crrev.com/6995db4290ba30940fde84539e49387c0c0a1bc5 Cr-Commit-Position: refs/heads/master@{#311310}

Patch Set 1 #

Patch Set 2 : combined partner_bookmarks and bookmarks folder #

Total comments: 4

Patch Set 3 : Ruslan's comments #

Patch Set 4 : fixed tests #

Unified diffs Side-by-side diffs Delta from patch set Stats (+2338 lines, -0 lines) Patch
A chrome/android/examples/partner_browser_customizations_provider/AndroidManifest.xml View 1 2 3 1 chunk +14 lines, -0 lines 0 comments Download
A chrome/android/examples/partner_browser_customizations_provider/README View 1 chunk +20 lines, -0 lines 0 comments Download
A chrome/android/examples/partner_browser_customizations_provider/src/com/android/partnerbrowsercustomizations/example/PartnerBrowserCustomizationsProviderExample.java View 1 2 1 chunk +103 lines, -0 lines 0 comments Download
A chrome/android/java/res/layout/homepage_preferences.xml View 1 2 1 chunk +65 lines, -0 lines 0 comments Download
A chrome/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksProviderIterator.java View 1 2 1 chunk +135 lines, -0 lines 0 comments Download
A chrome/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksReader.java View 1 2 1 chunk +272 lines, -0 lines 0 comments Download
A chrome/android/java/src/org/chromium/chrome/browser/partnerbookmarks/PartnerBookmarksShim.java View 1 2 1 chunk +36 lines, -0 lines 0 comments Download
A chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/HomepageManager.java View 1 2 1 chunk +159 lines, -0 lines 0 comments Download
A chrome/android/java/src/org/chromium/chrome/browser/partnercustomizations/PartnerBrowserCustomizations.java View 1 2 1 chunk +289 lines, -0 lines 0 comments Download
A chrome/android/java/src/org/chromium/chrome/browser/preferences/HomepagePreferences.java View 1 2 1 chunk +151 lines, -0 lines 0 comments Download
M chrome/android/java/strings/android_chrome_strings.grd View 1 2 3 1 chunk +5 lines, -0 lines 0 comments Download
A chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/BasePartnerBrowserCustomizationUnitTest.java View 1 2 1 chunk +59 lines, -0 lines 0 comments Download
A chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableBookmarksEditingUnitTest.java View 1 2 1 chunk +142 lines, -0 lines 0 comments Download
A chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerDisableIncognitoModeUnitTest.java View 1 2 1 chunk +141 lines, -0 lines 0 comments Download
A chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageUnitTest.java View 1 2 1 chunk +287 lines, -0 lines 0 comments Download
A chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/TestPartnerBrowserCustomizationsDelayedProvider.java View 1 2 1 chunk +65 lines, -0 lines 0 comments Download
A chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/TestPartnerBrowserCustomizationsProvider.java View 1 2 3 1 chunk +132 lines, -0 lines 0 comments Download
M chrome/android/shell/javatests/AndroidManifest.xml View 1 2 3 1 chunk +6 lines, -0 lines 0 comments Download
A chrome/browser/android/bookmarks/partner_bookmarks_reader.h View 1 2 1 chunk +50 lines, -0 lines 0 comments Download
A chrome/browser/android/bookmarks/partner_bookmarks_reader.cc View 1 2 3 1 chunk +201 lines, -0 lines 0 comments Download
M chrome/browser/android/chrome_jni_registrar.cc View 1 2 3 2 chunks +3 lines, -0 lines 0 comments Download
M chrome/chrome_browser.gypi View 1 2 3 2 chunks +3 lines, -0 lines 0 comments Download

Messages

Total messages: 18 (6 generated)
newt (away)
PTAL
5 years, 11 months ago (2015-01-07 02:34:12 UTC) #2
newt (away)
This is all copy pasted except for a few typo fixes or comment updates.
5 years, 11 months ago (2015-01-07 02:34:50 UTC) #3
Kibeom Kim (inactive)
file list lgtm
5 years, 11 months ago (2015-01-07 03:32:08 UTC) #4
aruslan
LGTM thanks! https://codereview.chromium.org/839663003/diff/20001/chrome/android/examples/partner_browser_customizations_provider/AndroidManifest.xml File chrome/android/examples/partner_browser_customizations_provider/AndroidManifest.xml (right): https://codereview.chromium.org/839663003/diff/20001/chrome/android/examples/partner_browser_customizations_provider/AndroidManifest.xml#newcode2 chrome/android/examples/partner_browser_customizations_provider/AndroidManifest.xml:2: <!-- Copyright 2014 The Chromium Authors. All ...
5 years, 11 months ago (2015-01-07 18:56:50 UTC) #5
newt (away)
https://codereview.chromium.org/839663003/diff/20001/chrome/android/examples/partner_browser_customizations_provider/AndroidManifest.xml File chrome/android/examples/partner_browser_customizations_provider/AndroidManifest.xml (right): https://codereview.chromium.org/839663003/diff/20001/chrome/android/examples/partner_browser_customizations_provider/AndroidManifest.xml#newcode2 chrome/android/examples/partner_browser_customizations_provider/AndroidManifest.xml:2: <!-- Copyright 2014 The Chromium Authors. All rights reserved. ...
5 years, 11 months ago (2015-01-07 20:53:55 UTC) #6
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/839663003/40001
5 years, 11 months ago (2015-01-07 21:29:24 UTC) #8
commit-bot: I haz the power
Try jobs failed on following builders: android_dbg_tests_recipe on tryserver.chromium.linux (http://build.chromium.org/p/tryserver.chromium.linux/builders/android_dbg_tests_recipe/builds/42817)
5 years, 11 months ago (2015-01-07 22:19:53 UTC) #10
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/839663003/60001
5 years, 11 months ago (2015-01-13 18:39:22 UTC) #12
commit-bot: I haz the power
Try jobs failed on following builders: ios_dbg_simulator on tryserver.chromium.mac (http://build.chromium.org/p/tryserver.chromium.mac/builders/ios_dbg_simulator/builds/48565)
5 years, 11 months ago (2015-01-13 19:21:54 UTC) #14
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-cq-status.appspot.com/patch-status/839663003/60001
5 years, 11 months ago (2015-01-13 19:43:35 UTC) #16
commit-bot: I haz the power
Committed patchset #4 (id:60001)
5 years, 11 months ago (2015-01-13 19:45:15 UTC) #17
commit-bot: I haz the power
5 years, 11 months ago (2015-01-13 19:45:51 UTC) #18
Message was sent while issue was closed.
Patchset 4 (id:??) landed as
https://crrev.com/6995db4290ba30940fde84539e49387c0c0a1bc5
Cr-Commit-Position: refs/heads/master@{#311310}

Powered by Google App Engine
This is Rietveld 408576698