Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Revert an unnecessary change in //build/compiler_version.py. #84

Open
wants to merge 1 commit into
base: nw25
Choose a base branch
from
Open

Revert an unnecessary change in //build/compiler_version.py. #84

wants to merge 1 commit into from

Conversation

hujiajie
Copy link

The script doesn't seem to be in use anymore, and in fact the change
will break assembler version detection.

@rogerwang rogerwang force-pushed the nw24 branch 2 times, most recently from e0e7aeb to 13bc321 Compare July 20, 2017 05:04
@rogerwang
Copy link
Member

We'll review this after 0.24.0 release as the PR is for nw24. Thanks.

@rogerwang rogerwang force-pushed the nw24 branch 2 times, most recently from ffa178c to 7a80b4f Compare July 25, 2017 23:11
@hujiajie
Copy link
Author

@rogerwang, please take a look. Thanks!

@GnorTech GnorTech force-pushed the nw24 branch 3 times, most recently from da91293 to 9a7251d Compare August 3, 2017 09:18
GnorTech pushed a commit that referenced this pull request Aug 5, 2017
@jacobdufault-google
Reland OOBE display chooser commits + add Mash guard
97e7eb3 
This CL will reland / revert revert 2 commits and add a non-Mash guard
for listening to DeviceDataManager. A TODO has been added about using
InputDeviceClient in Mash, but it's not super urgent as the reaction to
the event is a NOP in Mash further down the call chain.

Revert "Revert of Remove confusing keyboard test & focus on input device"
  commit 8a2f3aa

Revert "Revert "Listen to changes to touch input devices""
  commit 0cd134a

TBR=felixe@chromium.org

(cherry picked from commit d706dfc)

Bug: 738885
Change-Id: Ic805ca3966df2969d8444b2c441eac24f75dce62
Reviewed-on: https://chromium-review.googlesource.com/575138
Commit-Queue: Felix Ekblom <felixe@chromium.org>
Reviewed-by: Mitsuru Oshima <oshima@chromium.org>
Reviewed-by: Jacob Dufault <jdufault@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#488622}
Reviewed-on: https://chromium-review.googlesource.com/590352
Cr-Commit-Position: refs/branch-heads/3163@{#84}
Cr-Branched-From: ff259ba-refs/heads/master@{#488528}
@hujiajie hujiajie changed the base branch from nw24 to nw25 September 1, 2017 07:05
@hujiajie
Copy link
Author

hujiajie commented Sep 1, 2017

Please consider to review this one line change at your convenience. Thanks!

GnorTech pushed a commit that referenced this pull request Sep 14, 2017
recent: Fix crash in OnGetRecentFiles()
6d09a73 
render_frame_host() can be null after finishing async operations.
Remove DCHECK to stop accessing it.

BUG=762797
TEST=build
TBR=hashimoto@chromium.org

(cherry picked from commit 9ccbde3)

Change-Id: I2e05eca525bea28fb1ac3d75f3dbc500c7bd50c7
Reviewed-on: https://chromium-review.googlesource.com/654279
Reviewed-by: Tomasz Mikolajewski <mtomasz@chromium.org>
Reviewed-by: Shuhei Takahashi <nya@chromium.org>
Commit-Queue: Ryo Hashimoto <hashimoto@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#500229}
Reviewed-on: https://chromium-review.googlesource.com/656745
Reviewed-by: Ryo Hashimoto <hashimoto@chromium.org>
Cr-Commit-Position: refs/branch-heads/3202@{#84}
Cr-Branched-From: fa6a5d8-refs/heads/master@{#499098}
hujiajie pushed a commit to hujiajie/chromium.src that referenced this pull request Sep 14, 2017
Handle correctly start and commit of non-latest navigations.
1e54e3f 
Notable changes:
 - didStartProvisionalNavigation: is no op if passed navigation is not the latest
    navigation (this way didStartProvisionalNavigation: does not mess up with
    pending item)
 - didCommitNavigation: does not commit pending entry if if passed navigation
    is not the latest navigation. Instead it changes last committed item to one
    that matches with URL, which may not be correct, but it's just a minor
    temporary inconsistency which does not have any security implications
    (last committed URL is still correct).

BUG=711465

Review-Url: https://codereview.chromium.org/2821173002
Cr-Commit-Position: refs/heads/master@{#465669}
(cherry picked from commit 79d9b86)

Review-Url: https://codereview.chromium.org/2832853002 .
Cr-Commit-Position: refs/branch-heads/3071@{nwjs#84}
Cr-Branched-From: a106f0a-refs/heads/master@{#464641}
@hujiajie
Revert an unnecessary change in //build/compiler_version.py.
ad017a9 
The script doesn't seem to be in use anymore, and in fact the change
will break assembler version detection.
GnorTech pushed a commit that referenced this pull request Oct 27, 2017
@johnheroy
Sync 'false' prefs value for multidevice if feature flag is not enabled.
860a95c 
This change ensures that the ARC user preference for SMS Connect is false
if the feature flag is disabled, and the user-set preference (default: true)
when the feature flag is enabled.

Bug: 718617
Change-Id: I8389cf0082b29c3356d760acf44c83d8b8cf0848
Reviewed-on: https://chromium-review.googlesource.com/726322
Reviewed-by: David Jacobo <djacobo@chromium.org>
Reviewed-by: Yusuke Sato <yusukes@chromium.org>
Commit-Queue: John Heroy <jheroy@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#510105}(cherry picked from commit 9c9a90f)
Reviewed-on: https://chromium-review.googlesource.com/728622
Reviewed-by: Ryan Hansberry <hansberry@chromium.org>
Cr-Commit-Position: refs/branch-heads/3239@{#84}
Cr-Branched-From: adb61db-refs/heads/master@{#508578}
rogerwang pushed a commit that referenced this pull request Jan 29, 2018
Incrementing VERSION to 65.0.3325.20
949bc48 
TBR=dimu@chromium.org

Change-Id: I114105b73519ed3908d46dffd9a00308aed6c7da
Reviewed-on: https://chromium-review.googlesource.com/885301
Reviewed-by: chrome-release-bot@chromium.org <chrome-release-bot@chromium.org>
Cr-Commit-Position: refs/branch-heads/3325@{#84}
Cr-Branched-From: bc084a8-refs/heads/master@{#530369}
GnorTech pushed a commit that referenced this pull request Mar 20, 2018
[merge into m66]Remove the use of base::Unretained in ThreatDetail
1a37f06 
Since ThreatDetail is already a RefCountedThreadSafe object, no need to
use base::Unretained when binding it.

TBR=jialiul@chromium.org

(cherry picked from commit b7b0550)

Bug: 817724
Change-Id: I6795f5df05848c978d60796f682fd2bcf83dffa8
Reviewed-on: https://chromium-review.googlesource.com/944194
Reviewed-by: Varun Khaneja <vakh@chromium.org>
Reviewed-by: Luke Z <lpz@chromium.org>
Commit-Queue: Jialiu Lin <jialiul@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#540591}
Reviewed-on: https://chromium-review.googlesource.com/954606
Reviewed-by: Jialiu Lin <jialiul@chromium.org>
Cr-Commit-Position: refs/branch-heads/3359@{#84}
Cr-Branched-From: 66afc5e-refs/heads/master@{#540276}
rogerwang pushed a commit that referenced this pull request Apr 25, 2018
[EoC] Fix crash caused by invalid ukm_source_id
3f2a541 
Bootstrap the id by always calling ReportEvent(FETCH_REQUESTED) before
fetching.
Report FETCH_DELAYED when we set the baseline timestamp.
Ensure that events generated by the tab and triggering
delayed fetch are not checked against page being loaded

Bug: 832712
Change-Id: Ida168013b0920a6428093af943f06762dfbe0600
Reviewed-on: https://chromium-review.googlesource.com/1012440
Commit-Queue: Patrick Noland <pnoland@chromium.org>
Reviewed-by: Theresa <twellington@chromium.org>
Reviewed-by: Filip Gorski <fgorski@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#551169}(cherry picked from commit ff3479f)
Reviewed-on: https://chromium-review.googlesource.com/1016863
Reviewed-by: Patrick Noland <pnoland@chromium.org>
Cr-Commit-Position: refs/branch-heads/3396@{#84}
Cr-Branched-From: 9ef2aa8-refs/heads/master@{#550428}
rogerwang pushed a commit that referenced this pull request Jun 19, 2018
[Payments] Allow at most three redirects when downloading payment met…
c1d1d4e 
…hods manifests

Bug: 847572
Change-Id: Ibe089ddb6aff0e0f1b424bf830a4092cb1f2c295
Reviewed-on: https://chromium-review.googlesource.com/1079149
Reviewed-by: Mathieu Perreault <mathp@chromium.org>
Commit-Queue: Ganggui Tang <gogerald@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#563106}(cherry picked from commit 932bd30)
Reviewed-on: https://chromium-review.googlesource.com/1082451
Reviewed-by: Ganggui Tang <gogerald@chromium.org>
Cr-Commit-Position: refs/branch-heads/3440@{#84}
Cr-Branched-From: 010ddcf-refs/heads/master@{#561733}
GnorTech pushed a commit that referenced this pull request Aug 4, 2018
[Merge M69] [MessageLoop] Do not schedule sleeps > 1 day
73635a1 
Some platforms don't like timeouts > 100,000,000 seconds.

Note: I tried just banning long delays but it didn't work
(https://bugs.chromium.org/p/chromium/issues/detail?id=850450#c4).
And while we could control delays posted by our codebase (and we should
still try to address that), we can't control those set from Javascript.

TBR=​kylechar@chromium.org

Bug: 850450
Change-Id: Iaf1b983b7af1954412518ed049f6cd0a3f78ba2a
Reviewed-on: https://chromium-review.googlesource.com/1142602
Commit-Queue: Gabriel Charette <gab@chromium.org>
Reviewed-by: kylechar <kylechar@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#576857}(cherry picked from commit 5bd9b57)
Reviewed-on: https://chromium-review.googlesource.com/1150581
Reviewed-by: Gabriel Charette <gab@chromium.org>
Cr-Commit-Position: refs/branch-heads/3497@{#84}
Cr-Branched-From: 271eaf5-refs/heads/master@{#576753}
rogerwang pushed a commit that referenced this pull request Sep 15, 2018
Add getHardwarePlatformInfo to thunk.js for Hangouts
b97ba7c 
 Bug: 860311

Change-Id: Ifd314660829cc7434621e22b8d709e6ef233973f
Reviewed-on: https://chromium-review.googlesource.com/1193849
Commit-Queue: Guido Urdaneta <guidou@chromium.org>
Reviewed-by: Henrik Grunell <grunell@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#588275}(cherry picked from commit 1165f3f)
Reviewed-on: https://chromium-review.googlesource.com/1209382
Reviewed-by: Guido Urdaneta <guidou@chromium.org>
Cr-Commit-Position: refs/branch-heads/3538@{#84}
Cr-Branched-From: 79f7c91-refs/heads/master@{#587811}
rogerwang pushed a commit that referenced this pull request Oct 31, 2018
@nohle
[CrOS MultiDevice] Change "Cancel" to "No thanks" in OOBE
13ded78 
On the start setup page of OOBE, change the text of the cancel button to
read "No thanks" instead of "Cancel".

Screenshots:
OOBE: https://drive.google.com/open?id=1QjHg1_v1QFg1tph986Xi2igPUYG8nJlneA
post-OOBE: https://drive.google.com/open?id=1-hxQjU-WVMi8sAWNAZB-7LyrcX3F5ju5bQ

Bug: 893353
Change-Id: I748f282b392bccfe17bd14f8bc036cca786bb8f9
Tested: Manual; ./out/Default/browser_tests --gtest_filter=*MultiDevice*
Reviewed-on: https://chromium-review.googlesource.com/c/1272067
Commit-Queue: Josh Nohle <nohle@chromium.org>
Reviewed-by: Alexander Alekseev <alemate@chromium.org>
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#599860}(cherry picked from commit 8c25763)
Reviewed-on: https://chromium-review.googlesource.com/c/1286873
Reviewed-by: Jeremy Klein <jlklein@chromium.org>
Cr-Commit-Position: refs/branch-heads/3578@{#84}
Cr-Branched-From: 4226ddf-refs/heads/master@{#599034}
rogerwang pushed a commit that referenced this pull request Dec 18, 2018
[CrOS MultiDevice] Fix BLE scan result handling.
dc6efc1 
Previously, we would attempt a BLE scan any time that we got a
DeviceChanged() or DeviceAdded() callback. However, the DeviceChanged()
callback was invoked when a device was in the process of disconnecting,
meaning that we would see a disconnecting device, then try to start a
connection immediately. This resulted in spurious connection requests
which could sometime cause a deadlock in underlying Bluetooth code.
Additionally, we would rely on the DeviceChanged() and DeviceRemoved()
callbacks to listen for Bluetooth disconnections, which also resulted in
error-prone disconnections.

This CL updates both call sites to use the updated
DeviceAdvertisementReceived() and DeviceConnectedStateChanged()
callbacks instead.

Bug: 898334
Change-Id: I743e51e6e47194649ab6852966b9d892c3ef334d
Reviewed-on: https://chromium-review.googlesource.com/c/1359478
Commit-Queue: Kyle Horimoto <khorimoto@chromium.org>
Reviewed-by: Giovanni Ortuño Urquidi <ortuno@chromium.org>
Cr-Commit-Position: refs/heads/master@{#613358}
(cherry picked from commit af8d33b)

TBR: ortuno@chromium.org
Change-Id: I743e51e6e47194649ab6852966b9d892c3ef334d
Reviewed-on: https://chromium-review.googlesource.com/c/1363685
Reviewed-by: Kyle Horimoto <khorimoto@chromium.org>
Cr-Commit-Position: refs/branch-heads/3626@{#84}
Cr-Branched-From: d897fb1-refs/heads/master@{#612437}
rogerwang pushed a commit that referenced this pull request Feb 10, 2019
Revert "Enable Assistant for child accounts."
4234539 
This reverts commit 7c4d25d.

Reason for revert: feature punted to M74

Bug: 914210

Original change's description:
> Enable Assistant for child accounts.
>
> This reverts commit 71f820a ("Disable assistant for child account").
>
> Bug: b:120075638
> Test: built and tested locally
> Change-Id: I59d3d4869ba596fa462a904b8a64a88230c28325
> Reviewed-on: https://chromium-review.googlesource.com/c/1351155
> Commit-Queue: Henrique Nazaré Santos <nazare@google.com>
> Reviewed-by: Xiyuan Xia <xiyuan@chromium.org>
> Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
> Reviewed-by: Sam McNally <sammc@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#613206}

TBR=xiyuan@chromium.org,sammc@chromium.org,xiaohuic@chromium.org,nazare@google.com

Bug: b:120075638
Change-Id: I452fba75870677ec70fc3d1bcec3ab433c5361fd
Reviewed-on: https://chromium-review.googlesource.com/c/1447270
Reviewed-by: Xiaohui Chen <xiaohuic@chromium.org>
Cr-Commit-Position: refs/branch-heads/3683@{#84}
Cr-Branched-From: e510299-refs/heads/master@{#625896}
rogerwang pushed a commit that referenced this pull request Mar 24, 2019
[iOS][MF] Disconnect the mediator on |stop|.
f45c768 
Now the mediator stops observing objects when the incognito BVC is
destroyed. Waiting for dealloc was causing a race condition with the
autorelease pool, and some times a DCHECK will be hit.

A minor strong block reference is also fixed in this CL.

Bug: 934628, 939727
Change-Id: Ic65a7297eabf7ffad19119832a11125698215ea9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1515572
Commit-Queue: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Reviewed-by: Olivier Robin <olivierrobin@chromium.org>
Cr-Original-Commit-Position: refs/heads/master@{#639885}(cherry picked from commit 5cb6233cc8e90faf1e47b6fd1201a04c80206430)
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1520675
Reviewed-by: Javier Ernesto Flores Robles <javierrobles@chromium.org>
Cr-Commit-Position: refs/branch-heads/3729@{#84}
Cr-Branched-From: d4a8972-refs/heads/master@{#638880}
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@hujiajie @rogerwang