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

Issue 1218693004: Add build flag to disable hotwording. (Closed)

Created:
5 years, 5 months ago by Matt Giuca
Modified:
5 years, 5 months ago
CC:
chromium-reviews, skanuj+watch_chromium.org, melevin+watch_chromium.org, dhollowa+watch_chromium.org, dougw+watch_chromium.org, donnd+watch_chromium.org, rlp+watch_chromium.org, jfweitz+watch_chromium.org, David Black, samarth+watch_chromium.org, kmadhusu+watch_chromium.org, Jered
Base URL:
https://chromium.googlesource.com/chromium/src.git@2403
Target Ref:
refs/pending/branch-heads/2403
Project:
chromium
Visibility:
Public.

Description

Add build flag to disable hotwording. Hotwording downloads a shared module from the web store containing a NaCl module. There is a desire to build and distribute Chromium without this happening. This change adds an "enable_hotwording" build flag that is enabled by default, but can be disabled at compile time. BUG=491435 Review URL: https://codereview.chromium.org/1160243004 Cr-Commit-Position: refs/heads/master@{#333548} (cherry picked from commit f269d3b548203e217e8c0080c2e22e7ae3efb51e) Resolved merge conflict: Remove the body of IsHotwordAllowedDisabledFieldTrial and IsHotwordAllowedInvalidFieldTrial when ENABLE_HOTWORDING is false. These tests were deleted before the upstream patch landed. (Merge approval on http://crbug.com/500922#c69) TBR=thestig@chromium.org,scottmg@chromium.org

Patch Set 1 #

Patch Set 2 : Resolve merge conflict. #

Unified diffs Side-by-side diffs Delta from patch set Stats (+28 lines, -0 lines) Patch
M build/common.gypi View 2 chunks +4 lines, -0 lines 0 comments Download
M chrome/browser/BUILD.gn View 2 chunks +9 lines, -0 lines 0 comments Download
M chrome/browser/search/hotword_service.cc View 2 chunks +4 lines, -0 lines 0 comments Download
M chrome/browser/search/hotword_service_unittest.cc View 1 6 chunks +8 lines, -0 lines 0 comments Download
M chrome/chrome_browser.gypi View 1 chunk +3 lines, -0 lines 0 comments Download

Messages

Total messages: 4 (2 generated)
Matt Giuca
5 years, 5 months ago (2015-06-29 01:25:52 UTC) #2
Matt Giuca
5 years, 5 months ago (2015-06-29 01:57:20 UTC) #4
Message was sent while issue was closed.
Committed patchset #2 (id:20001) to pending queue manually as
837e54aaea52eec44b0108a9939f7c88ab26268a (presubmit successful).

Powered by Google App Engine
This is Rietveld 408576698