1. Publish DEPS for Chromium 61.0.3163.38
    
  2. Incrementing VERSION to 61.0.3163.38
    
    [email protected]
    
    Change-Id: I7bbd24206113a058a3e66332405f3be269a97cb9
    Reviewed-on: https://chromium-review.googlesource.com/604874
    Reviewed-by: [email protected] <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#373}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  3. app_list: update opacity per suggestions container
    
    changes:
    Regression comes from https://chromium-review.googlesource.com/c/585398
    where each SearchResultTileItemView is paint to layer, so that its
    opacity can be controlled. In folder view, we don't layout suggestions
    container view. Thus, it is better to make suggestions container view
    paint to layer.
    
    [email protected]
    
    (cherry picked from commit e784aa5fce4cfcaba5900c90676c9c807154c36f)
    
    Test: test that bug is fixed
    Bug: 743180
    Change-Id: Idb6151e1d58ed7265741ac4ab2c663f0a081bded
    Reviewed-on: https://chromium-review.googlesource.com/599456
    Commit-Queue: Qiang(Joe) Xu <[email protected]>
    Reviewed-by: Jenny Zhang <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491901}
    Reviewed-on: https://chromium-review.googlesource.com/604480
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#372}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  4. Restores the background of app list at the end of gesture dragging.
    
    [email protected]
    
    (cherry picked from commit ac439ba4a2209e0695c52e23ab49c6917e5c9326)
    
    Bug: 748620
    Change-Id: I37cb0ed1288b77044909bc03119f221acb1552cc
    Reviewed-on: https://chromium-review.googlesource.com/601327
    Reviewed-by: Steven Bennetts <[email protected]>
    Commit-Queue: min c <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491893}
    Reviewed-on: https://chromium-review.googlesource.com/604479
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#371}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  5. app_list: update selection highlight for opened search box
    
    changes:
    (1) no hover state highlight
    (2) update search result tile selection highlight
    (3) update search result simple row selection highlight
    (4) another opened search box background color change: when search box
    is opened (state is STATE_SEARCH_RESULTS), the background color should
    be #FAFAFC 100%.
    
    specs: https://screenshot.googleplex.com/thXHXNn3Vmt
    screenshot: https://screenshot.googleplex.com/UXtpfwpqHJY
    
    [email protected]
    
    (cherry picked from commit 69b0b1f6dd35533483d89879edca89269caa586e)
    
    Test: test with and without fullscreen app list flag
    Bug: 750690
    Change-Id: I090462bf36305393a55fcc1083c1c48fb5ae7a5a
    Reviewed-on: https://chromium-review.googlesource.com/600729
    Commit-Queue: Qiang(Joe) Xu <[email protected]>
    Reviewed-by: Steven Bennetts <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491813}
    Reviewed-on: https://chromium-review.googlesource.com/604476
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#370}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  6. Add animation when swiping app list from shelf.
    
    Swiping up from shelf to open app list is only for tablet currently.
    So set state as FULLSCREEN_ALL_APPS directly to add the animation.
    Otherwise, the app list will just snap to the top of the screen.
    
    [email protected]
    
    (cherry picked from commit 66506bb8f0650a19053275623860f274889616f4)
    
    Bug: None
    Change-Id: I281ae53700294221b0c96c9a2aa1d4c66822f2bf
    Reviewed-on: https://chromium-review.googlesource.com/598740
    Reviewed-by: Steven Bennetts <[email protected]>
    Commit-Queue: min c <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491765}
    Reviewed-on: https://chromium-review.googlesource.com/604475
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#369}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  7. cros: Peeking Launcher close animation
    
    Added a closing animation for the peeking launcher. It lives in
    AppListPresenterImpl because we use the callback function for the
    animation.
    
    The animations for all state changes will be in AppListView once we
    move ui/app_list into ash/app_list. (I made  a note in 733662 for this).
    
    bug=748190
    
    [email protected]
    
    (cherry picked from commit f019957f6fefa261f77d6e0890912b66a9b4b318)
    
    Change-Id: I2e2e885306f2005aa3bf54470420a6aada99a3b6
    Reviewed-on: https://chromium-review.googlesource.com/588083
    Commit-Queue: Alex Newcomer <[email protected]>
    Reviewed-by: Yury Khmel <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491639}
    Bug: 
    Reviewed-on: https://chromium-review.googlesource.com/604587
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#368}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  8. Enable touch for pagination indicators on launcher
    
    Changes:
    Enable touch event in PageSwitcherButton.
    
    BUG=750658
    [email protected]
    
    (cherry picked from commit 016663d8bb463ada632b37e5db8ff9fd3819c0d3)
    
    Change-Id: I293544abf5d90201687800d6d6d0451810dfaacd
    Reviewed-on: https://chromium-review.googlesource.com/595127
    Reviewed-by: Yury Khmel <[email protected]>
    Commit-Queue: Weidong Guo <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491629}
    Reviewed-on: https://chromium-review.googlesource.com/604492
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#367}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  9. Remove gray line under search box
    
    Changes:
    Draw the separator between search box and search results only when
    parent view's height is larger than search box height.
    
    BUG=750951
    [email protected]
    
    (cherry picked from commit b88847f155f52d710e4eff4fe95657b56b944e0b)
    
    Change-Id: I5ddd8b607c91b8a2272174157f0d232f18a0ee69
    Reviewed-on: https://chromium-review.googlesource.com/595245
    Reviewed-by: Steven Bennetts <[email protected]>
    Commit-Queue: Weidong Guo <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491614}
    Reviewed-on: https://chromium-review.googlesource.com/604507
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#366}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  10. [EasyUnlock] Add option in chrome://settings to enable EasyUnlock for login.
    
    Screenshot:
    https://screenshot.googleplex.com/BV3uweR38fL.png
    
    See mocks at:
    https://docs.google.com/presentation/d/1GnKn5ca_KrM_BTQB-He9cCmzAQtwVF6JJJ6Lo6i4gqI/edit#slide=id.g4af27b4ff_35243
    
    BUG=748288
    [email protected]
    
    (cherry picked from commit 58fb4d1d465ac79eb21cdbd29640faa3f38a500f)
    
    Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
    Change-Id: I6f8f0b92164d546c1670816a76d3289d648955f1
    Reviewed-on: https://chromium-review.googlesource.com/582342
    Reviewed-by: Steven Bennetts <[email protected]>
    Reviewed-by: Gustavo Sacomoto <[email protected]>
    Commit-Queue: Tim Song <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491185}
    Reviewed-on: https://chromium-review.googlesource.com/604331
    Reviewed-by: Tim Song <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#365}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  11. Updating XTBs based on .GRDs from branch 3163
    
    [email protected]
    
    Change-Id: I3cea15b5795374b039191f53e47e5ee446639307
    
    CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
    
    Change-Id: I3cea15b5795374b039191f53e47e5ee446639307
    Reviewed-on: https://chromium-review.googlesource.com/603969
    Reviewed-by: Krishna Govind <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#364}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  12. cc: Use at most medium filter quality in gpu image decode cache.
    
    This patch ensures that when passing a draw image to Skia, we only use
    at most medium filter quality. This is on par with the software decode
    cache and saves power.
    
    [email protected], [email protected]
    [email protected]
    
    (cherry picked from commit 030df82ef689b9aff91b700c72c08e9cf9215347)
    
    Bug: 747500
    Change-Id: Idc42c1a176ebd6394ae23324a37724b82278d9cc
    Reviewed-on: https://chromium-review.googlesource.com/585404
    Commit-Queue: Vladimir Levin <[email protected]>
    Reviewed-by: Philip Rogers <[email protected]>
    Reviewed-by: Eric Karl <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#492091}
    Reviewed-on: https://chromium-review.googlesource.com/604232
    Reviewed-by: Vladimir Levin <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#363}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  13. [EasyUnlock] Add ProximityAuthLocalStatePrefManager for managing prefs before login.
    
    This CL also refactors ProximityAuthProfilePRefManager to handle the syncing of
    profile prefs to local state.
    
    BUG=748879
    [email protected]
    
    (cherry picked from commit 947837858fe1b396546b30ecb59569239af09d09)
    
    Change-Id: Ia09a772b10b7b3e2305153c52b1457101cd950c5
    Reviewed-on: https://chromium-review.googlesource.com/585899
    Commit-Queue: Tim Song <[email protected]>
    Reviewed-by: Tim Song <[email protected]>
    Reviewed-by: Gustavo Sacomoto <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491102}
    Reviewed-on: https://chromium-review.googlesource.com/604212
    Cr-Commit-Position: refs/branch-heads/3163@{#362}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  14. GRC: Make CoordinationUnitImpls have their lifespan explicitly managed by the service.
    
    A few consequences of this:
    * To be able to easily tear down all the active CoordinationUnitImpls, the static CU map
      now owns the CoordinationUnitImpls as unique_ptrs, rather than just holding a raw
      pointer to them.
    * Because of the above, client code that creates CoordinationUnitImpls must now explicitly
      call Destruct() on these. This mainly impacts test code, so I've made a
      TestCoordinationUnitWrapper which RAII handles this.
    
    [email protected]
    
    (cherry picked from commit 1f637d9b2977128cc48202a0cb5c9c5f8ed7a647)
    
    Bug: 749804
    Change-Id: I251c17606c2b055a6a66409681c954cdd76b58d6
    Reviewed-on: https://chromium-review.googlesource.com/590700
    Commit-Queue: Erik Chen <[email protected]>
    Reviewed-by: Zhen Wang <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490654}
    Reviewed-on: https://chromium-review.googlesource.com/604210
    Reviewed-by: Oystein Eftevaag <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#361}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  15. Data saver site breakdown disappears on screen rotation
    
    Fix bug where Data Saver site breakdown disappears on rotation.
    The site breakdown view was being re-inflated, but the data was not
    being set again.
    
    [email protected]
    
    (cherry picked from commit 9f51b6751b525c24aff5d2f3efc7fa43e592d91d)
    
    Bug: 749790
    Change-Id: I1d0ea9f9bff8e65dc83116d84291a3ffd452f0b7
    Reviewed-on: https://chromium-review.googlesource.com/590765
    Reviewed-by: Theresa <[email protected]>
    Commit-Queue: Megan Jablonski <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490849}
    Reviewed-on: https://chromium-review.googlesource.com/603886
    Reviewed-by: Megan Jablonski <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#360}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  16. Don't bind to SsbService on low-end devices.
    
    We only use SsbService to pass signed in account data for Icing. On
    low-end devices, Icing is disabled, so we don't need this data.
    
    BUG=750365
    [email protected]
    
    (cherry picked from commit 921be3d90061bb40d9f54e015cc7e54843e152ad)
    
    Change-Id: I00d9faa3a592de4b5471ec5226508facbd48c637
    Reviewed-on: https://chromium-review.googlesource.com/592487
    Commit-Queue: Maria Khomenko <[email protected]>
    Reviewed-by: Benoit L <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491105}
    Reviewed-on: https://chromium-review.googlesource.com/604048
    Reviewed-by: Maria Khomenko <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#359}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  17. [Merge to M61] Update the keyboard overlay to reflect keyboard layouts of newer chromebooks
    
    When the internal keyboard has the new keyboard layout, the keyboard overlay
    should show the correct layout and the corresponding shortcuts.
    
    [email protected], [email protected]
    BUG=743096
    TEST=manually.
    
    (cherry picked from commit 7923722cfe87a3f6b459b668c1a901d96080a681)
    
    Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
    Change-Id: I4fc06c1b76ac852897b4ccfdb2917d927fc9c304
    Reviewed-on: https://chromium-review.googlesource.com/597227
    Commit-Queue: Ahmed Fakhry <[email protected]>
    Reviewed-by: Steven Bennetts <[email protected]>
    Reviewed-by: Dan Erat <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#492152}
    Reviewed-on: https://chromium-review.googlesource.com/604114
    Reviewed-by: Ahmed Fakhry <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#358}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  18. Convert CHECK to DCHECK While working on the actual fix, converting these to DCHECKS
    
    Only one assert is failing in the field now:
    CHECK(is_partial || (!entry->writer && entry->done_headers_queue.empty()))
    
    which is being tracked in  crbug.com/750725
    
    Rest can be safely converted to DCHECKs.
    
    (cherry picked from commit f4cadce96567442121b9d97d2b4c733f05dd59c2)
    [email protected]
    
    Bug: 751111
    Change-Id: I5d7bb011115248ff101c3f9be180f1e9bb55109b
    Reviewed-on: https://chromium-review.googlesource.com/596187
    Reviewed-by: Josh Karlin <[email protected]>
    Commit-Queue: Josh Karlin <[email protected]>
    Commit-Queue: Shivani Sharma <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491051}
    Reviewed-on: https://chromium-review.googlesource.com/604112
    Reviewed-by: Shivani Sharma <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#357}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  19. [EasyUnlock] Adding the NotificationController to the PromotionManager.
    
    With this CL the PromotionManager will start to actually display the
    promotion notification.
    
    This CL also adds a pref to store the number of times the promotion
    was shown to the user, and ensure it's never shown more than 3 times.
    
    [email protected]
    
    (cherry picked from commit 2aa991d3bb04de729305b9c99a96f652e17d314b)
    
    Bug: 741709
    Change-Id: I895865f762140482c95038844b0eaa884dcfe7e6
    Reviewed-on: https://chromium-review.googlesource.com/580952
    Commit-Queue: Gustavo Sacomoto <[email protected]>
    Reviewed-by: Tim Song <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#489940}
    Reviewed-on: https://chromium-review.googlesource.com/603915
    Cr-Commit-Position: refs/branch-heads/3163@{#356}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  20. [CrOS Tether] Add message to settings explaining how to tether.
    
    The message is displayed on the top-level settings page when Bluetooth
    is disabled and, thus, is preventing tether scans from beginning. The
    text of the message instructs users to enable Bluetooth in order to
    discover nearby tether hosts.
    
    Previously, in this situation, the settings page would just display the
    text "Off" with a disabled settings item and no instructions on how to
    enable it.
    
    [email protected]
    
    (cherry picked from commit 78f2add0300d4988b98362f683810c33dfcb993a)
    
    Bug: 751888, 672263
    Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
    Change-Id: I5e09be7b7b0032f7c317b0f46821eb8bc6bcdf9a
    Reviewed-on: https://chromium-review.googlesource.com/602576
    Reviewed-by: Steven Bennetts <[email protected]>
    Commit-Queue: Kyle Horimoto <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#492184}
    Reviewed-on: https://chromium-review.googlesource.com/603914
    Reviewed-by: Kyle Horimoto <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#355}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  21. [EasyUnlock] Gating EasyUnlock promotions behind a Finch experiment.
    
    [email protected]
    
    (cherry picked from commit fb11164f803c5012031a16bdbcea3c96095e71f9)
    
    Bug: 741709
    Change-Id: I7ecf2621d51b6ddb1824608007f3b20514652d6b
    Reviewed-on: https://chromium-review.googlesource.com/576040
    Commit-Queue: Gustavo Sacomoto <[email protected]>
    Reviewed-by: Tim Song <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#488637}
    Reviewed-on: https://chromium-review.googlesource.com/603913
    Cr-Commit-Position: refs/branch-heads/3163@{#354}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  22. [CrOS Tether] Fix crash in SecureChannel during Tether disconnection.
    
    There are 3 pieces to this fix:
    (1) DisconnectTetheringOperation killed the connection when the message
        was sent successfully, but the SecureChannel still exectuted code
        after that point, which caused a crash since deleted memory was
        accessed. To remedy this, SecureChannel now uses a WeakPtr to verify
        that the object had not been deleted before continuing.
    (2) DisconnectTetheringOperation returned a was_authenticated_ boolean
        to its observers after sending the message, but this does not
        actually indicate whether the operation was successful. Now,
        has_sent_message_ is returned instead.
    (3) A timeout is included in DisconnectTetheringOperation even though
        we do not expect a response so that if the message is never able to
        be sent, the connection is eventually destroyed. Since the timeout
        is now being used in this case, I reworded the function so that it
        no longer refers to this timeout being a "response" timeout.
    
    [email protected]
    
    (cherry picked from commit f731607fb19cb16717f1df0c8944aa99298cca11)
    
    Bug: 751884, 672263
    Change-Id: I4f71f19850d47d7a06b594ac87b005631e9af67d
    Reviewed-on: https://chromium-review.googlesource.com/601125
    Commit-Queue: Kyle Horimoto <[email protected]>
    Reviewed-by: Ryan Hansberry <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#492187}
    Reviewed-on: https://chromium-review.googlesource.com/603912
    Reviewed-by: Kyle Horimoto <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#353}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  23. [EasyUnlock] Exposing a proximity threshold selector in settings.
    
    The mocks are here:
    https://docs.google.com/a/google.com/presentation/d/1GnKn5ca_KrM_BTQB-He9cCmzAQtwVF6JJJ6Lo6i4gqI/edit?usp=sharing (slide 38)
    
    EasyUnlock is disabled:
    https://screenshot.googleplex.com/2WxZMn78UgM
    
    EasyUnlock is enabled (the default value is selected):
    https://screenshot.googleplex.com/WJ0KYLa5Jhm
    
    EasyUnlock is enabled, user is selecting the value:
    https://screenshot.googleplex.com/AXUadsCLgax
    
    [email protected]
    
    (cherry picked from commit 290a492b2f848ae26608d6f925c18c9b0ec2bede)
    
    Bug: 724715
    Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
    Change-Id: I77e3f7a2d28feb9c5c8c9557df39c61c7e9065f0
    Reviewed-on: https://chromium-review.googlesource.com/580407
    Commit-Queue: Gustavo Sacomoto <[email protected]>
    Reviewed-by: Tim Song <[email protected]>
    Reviewed-by: Steven Bennetts <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#488642}
    Reviewed-on: https://chromium-review.googlesource.com/604110
    Cr-Commit-Position: refs/branch-heads/3163@{#352}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  24. [CrOS Tether] DisconnectTetheringOperation: Delay device unregistration.
    
    Previously, DisconnectTetheringOperation would call
    SendMessageToDevice(), then immediately call UnregisterDevice().
    However, this created a race condition where if the device was
    unregistered before the message was successfully sent, we crashed the
    browser.
    
    [email protected]
    
    (cherry picked from commit e63531ca5b9478b2c31dcfef93ebe2fd07c675b7)
    
    Bug: 672263, 731181
    Change-Id: I0da8b47b2129c7bf68f693d15c821e67415737b1
    Reviewed-on: https://chromium-review.googlesource.com/590810
    Commit-Queue: Kyle Horimoto <[email protected]>
    Reviewed-by: Ryan Hansberry <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490605}
    Reviewed-on: https://chromium-review.googlesource.com/603869
    Reviewed-by: Kyle Horimoto <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#351}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  25. [EasyUnlock] Refactor ProximityAuthPrefManager to an interface.
    
    This CL splits ProximityAuthPrefManager into an interface and an user profile
    based implementation. In a future CL, we will add an implementation based on the
    local state before the user logs in.
    
    BUG=747635
    [email protected]
    
    (cherry picked from commit 3f31990b520b86a7f7e26b25fc7946ff6013db0c)
    
    Change-Id: Ife070f97db0eb39882f626e7c4cb64172aa2ac5c
    Reviewed-on: https://chromium-review.googlesource.com/582217
    Commit-Queue: Tim Song <[email protected]>
    Reviewed-by: Gustavo Sacomoto <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#489206}
    Reviewed-on: https://chromium-review.googlesource.com/604091
    Reviewed-by: Tim Song <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#350}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  26. [EasyUnlock] Hook up Chromebook added and pairing changed notifications.
    
    BUG=748286
    [email protected]
    
    (cherry picked from commit e538c57db8acf0348dd08bcb4ab2bd0ffa873cb1)
    
    Change-Id: I1a94a2a760abfd778d471561388ded211fb0bd08
    Reviewed-on: https://chromium-review.googlesource.com/580525
    Commit-Queue: Tim Song <[email protected]>
    Reviewed-by: Gustavo Sacomoto <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#489237}
    Reviewed-on: https://chromium-review.googlesource.com/604090
    Reviewed-by: Tim Song <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#349}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  27. Introduce FastInkPointerController
    
    A common base class for for LaserPointerController and
    HighlighterController that incapsulates touch event
    handling and manages the pointer view lifecycle.
    
    [email protected]
    
    (cherry picked from commit 35e2cdbdf0f1dbb7a7dc4d133ad0aac19c2fe6bb)
    
    Bug: 750235
    Change-Id: I82cade80bd192e08069da9a159c9ab592cdcc026
    Reviewed-on: https://chromium-review.googlesource.com/600640
    Reviewed-by: James Cook <[email protected]>
    Reviewed-by: David Reveman <[email protected]>
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#492156}
    Reviewed-on: https://chromium-review.googlesource.com/603968
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#348}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  28. Fix ArticleSnippetsTest
    
    Bug: 752567
    Change-Id: Ie05107a53c07d2601bb6aacca60ca8029e47a62b
    Reviewed-on: https://chromium-review.googlesource.com/603710
    Reviewed-by: Bernhard Bauer <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#347}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  29. Fix border radius masks for transformed children.
    
    M-61 Merge.
    
    A previous change starting using the compositing_bounds_ for
    determining if a border radius clipping mask is required. However,
    that bound does not include transformations that will be applied to
    the child's layer. This change uses the child's layer bound in its
    nearest clipping ancestor's space, and performs all clip testing in
    that space.
    
    [email protected]
    
    (cherry picked from commit 973b7b9212b8d7b956d50f00792995d9712e4186)
    
    Bug: 751798
    Cq-Include-Trybots: master.tryserver.chromium.linux:linux_layout_tests_slimming_paint_v2
    Change-Id: I7e55c11cd54198dcfea2dc547e27133294465795
    Reviewed-on: https://chromium-review.googlesource.com/539835
    Commit-Queue: Stephen Chenney <[email protected]>
    Reviewed-by: Chris Harrelson <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#492036}
    Reviewed-on: https://chromium-review.googlesource.com/603967
    Reviewed-by: Stephen Chenney <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#346}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  30. [Merge to M61] Treat empty login_screen_input_methods policy as no-op
    
    If an empty login_screen_input_methods policy is sent from the server,
    treat it as if the policy was not present. Don't restrict input methods
    in this case.
    
    BUG=750572
    TEST=browser_tests --gtest_filter=LoginScreenPolicyTest.*
    [email protected]
    
    (cherry picked from commit 9988a1bb6a0df58747556caa319c4d3019a72418)
    
    Change-Id: I83109bb5c7648ac6a7f81da414879745bf905abb
    Reviewed-on: https://chromium-review.googlesource.com/589436
    Reviewed-by: Alexander Alekseev <[email protected]>
    Commit-Queue: Pavol Marko <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491380}
    Reviewed-on: https://chromium-review.googlesource.com/603608
    Reviewed-by: Pavol Marko <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#345}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  31. Revert "Restrict notification permission requests to top-level secure contexts"
    
    This reverts commit 393740484abb65c13ac7769ddc5a96a47befa79a.
    
    Reason for revert: this change hasn't been completed for M61,
    so we'll punt to M62 and finish integration with the rest of the
    permission systems.
    
    Original change's description:
    > Restrict notification permission requests to top-level secure contexts
    >
    > Requesting notification permission could previously happen from any
    > context, which included iframes and insecure origins. Starting with
    > Chrome 61 we're restricting this to top-level secure contexts.
    >
    > Usage will continue to be allowed in iframes once permission has been
    > granted from a top-level frame. Origins could easily work around such a
    > restriction by posting a message to their Service Worker, so it doesn't
    > make sense to impose it.
    >
    > BUG=695693
    > TBR=stevenjb (http -> https in site settings unit test)
    >
    > Change-Id: I33fe4278ed3ecd388872c74e6f299589855ea835
    > Reviewed-on: https://chromium-review.googlesource.com/558095
    > Reviewed-by: Peter Beverloo <[email protected]>
    > Reviewed-by: Emil A Eklund <[email protected]>
    > Reviewed-by: Dominick Ng <[email protected]>
    > Reviewed-by: Raymes Khoury <[email protected]>
    > Commit-Queue: Peter Beverloo <[email protected]>
    > Cr-Commit-Position: refs/heads/master@{#487935}
    
    [email protected], [email protected], [email protected], [email protected], [email protected]
    
    
    (cherry picked from commit f88aa4c173cc536d761412e801fb9aa4dd8895eb)
    
    Bug: 695693
    Change-Id: If22e77639e8ee925855c47f127d466a5677aebaf
    Reviewed-on: https://chromium-review.googlesource.com/590492
    Reviewed-by: Peter Beverloo <[email protected]>
    Reviewed-by: Dominick Ng <[email protected]>
    Reviewed-by: Raymes Khoury <[email protected]>
    Commit-Queue: Peter Beverloo <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490414}
    Reviewed-on: https://chromium-review.googlesource.com/603688
    Cr-Commit-Position: refs/branch-heads/3163@{#344}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  32. Fix keeping track of number of seen cards.
    
    The recent change to issue a fetch instead of a fetch-more surfaced
    some side-effects with how already seen surfaces get updated.
    When dismissing a card, we did not adjust the number of seen cards
    which lead to a situation where the append logic thinks more cards are
    present than actually are. The result is an empty or not fully
    populated list.
    This CL
    -- properly adjusts the counter when a suggestion gets removed or dismissed.
    -- moves a bit more logic into appendSuggestions() to give it clearer semantics.
    
    [email protected]
    
    (cherry picked from commit e0d5ddb814706c395097aa7402cbac08693dcf85)
    
    Bug: 728570
    Change-Id: I010c92b470f59a54fb66fd87cb60e7bbb5f74521
    Reviewed-on: https://chromium-review.googlesource.com/584447
    Commit-Queue: Tim Schumann <[email protected]>
    Reviewed-by: Nicolas Dossou-Gbété <[email protected]>
    Reviewed-by: Jan Krcal <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490291}
    Reviewed-on: https://chromium-review.googlesource.com/603288
    Reviewed-by: Tim Schumann <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#343}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  33. Set target for DropTargetEvent.
    
    Wayland server in Chrome assumes events have aura::Window as their target.
    However DropTargetEvent did not have target previously.
    
    BUG=750997, b:31988797
    TEST=NONE
    [email protected]
    
    (cherry picked from commit ad18a3e1e9c4eedbc256dfc5007aa21c665f12cc)
    
    Change-Id: I2912fe1fb3b1c73ceb08989e8e9a00c0d4892fd2
    Reviewed-on: https://chromium-review.googlesource.com/593512
    Commit-Queue: Daichi Hirono <[email protected]>
    Reviewed-by: Sadrul Chowdhury <[email protected]>
    Reviewed-by: Scott Violet <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491326}
    Reviewed-on: https://chromium-review.googlesource.com/602397
    Reviewed-by: Daichi Hirono <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#342}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  34. Incrementing VERSION to 61.0.3163.37
    
    [email protected]
    
    Change-Id: I6b633451cb97af0577875b416ce237f1a8222b46
    Reviewed-on: https://chromium-review.googlesource.com/603153
    Reviewed-by: [email protected] <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#341}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  35. ui: Add descriptions for upcoming default user images.
    
    BUG=721647
    
    Change-Id: Ibd1c8e1a0d3222729beaff73a33197e8c7e5e9bc
    Reviewed-on: https://chromium-review.googlesource.com/602771
    Reviewed-by: David Reveman <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#340}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  36. Incrementing VERSION to 61.0.3163.36
    
    [email protected]
    
    Change-Id: Ib2790401e9b6d06da7ccc1fefb6772f2584c67ba
    Reviewed-on: https://chromium-review.googlesource.com/602641
    Reviewed-by: [email protected] <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#339}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  37. Lock compositor while rotating arc window in tablet mode
    
    * This locks the compositor and prevent updating while waiting for the rotated frame.
    * Timeout is currently a bit longer than I deal because Android seems to generate
      unnecessary frames that uses old bounds. I'll look into the issue separately.
    
    Bug: b/62140863
    TBR: [email protected]
    Test: Manual.
    1) Apply Android side patch: https://googleplex-android-review.git.corp.google.com/#/c/2548263/
    2) Login & start ARC++ app that can rotate
    3) Switch to tablet mode and tilt the device.
    
    (cherry picked from commit d431d1dc0e5c027cad94957c82cb7baab8d16b54)
    
    Change-Id: Ifb1427365cc524d69cf3b84c446fe108ca9e7a46
    Reviewed-on: https://chromium-review.googlesource.com/572391
    Commit-Queue: Mitsuru Oshima <[email protected]>
    Reviewed-by: David Reveman <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491638}
    Reviewed-on: https://chromium-review.googlesource.com/603002
    Reviewed-by: Mitsuru Oshima <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#338}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  38. Create a widget if necessary when auto hide flag is sent
    
    Now the state change will change when frames arrives, we first
    need to create widget if the auto hide is set in creation time.
    
    BUG=751915
    [email protected]
    TEST=None
    
    (cherry picked from commit 73ab5a74d5a4708eac466a018b8cc1ccacb48375)
    
    Change-Id: If8810692766a4c83f6f55de2bd9553fa1cd7ea0e
    Reviewed-on: https://chromium-review.googlesource.com/599360
    Commit-Queue: Mitsuru Oshima <[email protected]>
    Reviewed-by: David Reveman <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491633}
    Reviewed-on: https://chromium-review.googlesource.com/601309
    Reviewed-by: Mitsuru Oshima <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#337}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  39. arc/bluetooth: Fix the powered state synchronization between Chrome and Android
    
    Since the observation of the local powered state change and the receiver of
    enable/disable requests from Android is in arc_bluetooth_service are in
    arc_setting_service and arc_bluetooth_bridge separately, the power state can
    get out of sync or restore to the wrong state due to the lack of coordination
    between these two pieces of information.
    
    Issues:
    - The powered state can get out-of-sync between Android and Chrome if the power
      state of adapter is repeatedly toggled from Chrome setting.
    - If the powered state is ON before deep suspend/resume, the state will
      turn to OFF after resume and turn immediately back to ON on Chrome. However
      without waiting for the previous disable intent to finish, arc_setting_service
      sends the enable intent right after while Android Bluetooth statck is still
      processing the disable intent. Also there is a 3~4 seconds delay for bringing
      down to complete on Android Bluetooth stack. Besides, the enable intent
      is treated as a no op if the ongoing intent is disable. So after 3~4 seconds
      Android sends a disable request to Chrome while the powered state is ON on
      Chrome, so the powered state fall to the wrong one, disable, instead.
    
    The changes includes:
     - moving the observation of Bluetooth adapter from arc_settings_service
       to arc_bluetooth_bridge,
     - changing the cycle of observing Bluetooth adapter from living along with ARC
       Bluetooth instance to living along with ARC Bluetooth bridge,
     - adding IntentHelperObserver to listen to the OnInstanceReady event and fire
       the initial powered state of Bluetooth to Android via intent,
     - adding two queues and a timer to track the powered state changes initiated by
       either Chrome or Android and to track the completion of the power
       changes initiated by Chrome,
     - and adding helper functions to enqueue/dequeue the power change intents and
       to compress the toggling of state to reduce the intents sent to Android.
    
    BUG=b:62578573
    TEST=(1) On Android start-up, verify that the powered state is synchronized
         between Android and Chrome.
         (2) After Repeatedly toggling Bluetooth powered state, the state
         remains synchronized between Android and Chrome.
         (3) Put device into deep suspend and resume, the state restores to
         the previous state.
    
    (cherry picked from commit bb12724fdb4fa29d6e2233cdabda201f08b30c27)
    
    [email protected]
    
    Change-Id: I753839e2bb9228703492ebd23703cf8b67494998
    Reviewed-on: https://chromium-review.googlesource.com/580314
    Commit-Queue: Miao-chen Chou <[email protected]>
    Reviewed-by: Luis Hector Chavez <[email protected]>
    Reviewed-by: Rahul Chaturvedi <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491556}
    Reviewed-on: https://chromium-review.googlesource.com/603000
    Reviewed-by: Miao-chen Chou <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#336}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  40. Incrementing VERSION to 61.0.3163.35
    
    [email protected]
    
    Change-Id: Id22456df44668711e403e5de027dec3688eaa919
    Reviewed-on: https://chromium-review.googlesource.com/603047
    Reviewed-by: [email protected] <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#335}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  41. Incrementing VERSION to 61.0.3163.34
    
    [email protected]
    
    Change-Id: Ic7e5462beec8c13aeee521564a568a01ac3640d1
    Reviewed-on: https://chromium-review.googlesource.com/602266
    Reviewed-by: [email protected] <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#334}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  42. merge to 61: stylus: Use the correct icon for capture region mode on tray.
    
    Previous was the capture screen icon when capture region mode was going on.
    
    [email protected]
    
    (cherry picked from commit ab5e21d85908ca5375e3e37820953d9f78a2c7a3)
    
    Test: manual
    Bug: 752236
    Change-Id: If47ae606a11052589dc689e2ec8f055fb399559a
    Reviewed-on: https://chromium-review.googlesource.com/602071
    Reviewed-by: Terry Anderson <[email protected]>
    Commit-Queue: Sammie Quon <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#492055}
    Reviewed-on: https://chromium-review.googlesource.com/602863
    Reviewed-by: Sammie Quon <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#333}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  43. [merge to m61] Fix IPC serialization for blur_tile_mode in FilterOperation.
    
    merge to m61 on behalf of wutao@
    
    IPC serialization is still used by Android WebView in production so
    it must still be maintained. Therefore, adding new members to
    FilterOperation requires both modifying the ipc and mojo serialization.
    mojo part has already been implemented in cl 559935. Adding ipc part
    in this cl.
    
    (cherry picked from commit 3be18307d9050ee317a888fc201893e064717edf)
    
    TBR: [email protected], [email protected], [email protected]
    Bug: 748155
    Test: CCParamTraitsTest && manual Webview test
    Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
    Change-Id: Id96d60b567dc4c9cf5743b58c93cb2be49fe53e6
    Reviewed-on: https://chromium-review.googlesource.com/601546
    Commit-Queue: Tao Wu <[email protected]>
    Reviewed-by: Oliver Chang <[email protected]>
    Reviewed-by: enne <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#492077}
    Reviewed-on: https://chromium-review.googlesource.com/602257
    Reviewed-by: Qiang(Joe) Xu <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#332}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  44. Use TextAppearanceSpan for RobotoStyleMedium spans
    
    Previously a couple of places were creating a StyleSpan using
    RobotoMediumStyle which is not supported. A TextAppearanceSpan is
    used instead.
    
    BUG=749753
    [email protected], [email protected]
    
    (cherry picked from commit adc4d6dc9421fce3a15903b134c51782499cc897)
    
    Change-Id: Ibb3a9a5853d0442db991e1ab7b002286b13bf37f
    Reviewed-on: https://chromium-review.googlesource.com/590927
    Reviewed-by: Ted Choc <[email protected]>
    Commit-Queue: Theresa <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490184}
    Reviewed-on: https://chromium-review.googlesource.com/602856
    Reviewed-by: Theresa <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#331}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  45. Removing the pref check for client-lofi when in the blacklist experiment
    
    This change removes the check for lofi_off that reflects historical opt
    out preferences for server previews, but is no longer checked for server
    previews.
    
    [email protected]
    
    (cherry picked from commit c7673aa794736e35e5cd1cff653117ea8409c007)
    
    Bug: 745250
    Change-Id: I22fe6f6887aace8b37a7c9b5dfa5cb2cbee6a923
    Reviewed-on: https://chromium-review.googlesource.com/585362
    Reviewed-by: Charlie Harrison <[email protected]>
    Reviewed-by: Ryan Sturm <[email protected]>
    Reviewed-by: Tarun Bansal <[email protected]>
    Commit-Queue: Ryan Sturm <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#489753}
    Reviewed-on: https://chromium-review.googlesource.com/602878
    Reviewed-by: Scott Little <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#330}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  46. [Merge to M61] Make Android Clock App headless
    
    It will be one of the default ARC apps, but we don't want it to show
    up in the launcher.
    
    [email protected]
    BUG=744719
    TEST=Install a new image build with the new PAI apk, and make sure
    Clock don't show up in the launcher, yet it is installed from the
    play store.
    
    (cherry picked from commit 1e79a044e254212a472e8411622969297e9ee4a0)
    
    Change-Id: I9994c740f4bad64515a4b88c6d6734684f9f6ec2
    Reviewed-on: https://chromium-review.googlesource.com/594664
    Reviewed-by: Yury Khmel <[email protected]>
    Commit-Queue: Ahmed Fakhry <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491537}
    Reviewed-on: https://chromium-review.googlesource.com/602785
    Reviewed-by: Ahmed Fakhry <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#329}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  47. Continue distributing old signing key in RPMs.
    
    RPM packages are going to still be signed with the old key for now
    because rpm apparently can't handle our new GPG subkeys.
    
    R=​[email protected]
    
    Bug: 677046
    Change-Id: I54037622ca38e20d8403f3f60bab33fcf5e2f8ec
    Reviewed-on: https://chromium-review.googlesource.com/600893
    Reviewed-by: Lei Zhang <[email protected]>
    Commit-Queue: Michael Moss <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491859}(cherry picked from commit aed698afc47c7779028d71af32ff08cffef375d0)
    Reviewed-on: https://chromium-review.googlesource.com/602581
    Reviewed-by: Michael Moss <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#328}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  48. cros: Take voice interaction service screenshot at 1:1 scale
    
    The screenshot implementation copies the layer tree and inherits
    the transform from the root window. When user zoom is applied,
    this transform contains scaling which affects the screenshot
    size.
    
    Resetting this transform on the copied layer tree root ensures
    that the screenshot is taken in screen pixels.
    
    [email protected], [email protected]
    
    (cherry picked from commit 095f5f2a9dd3d7823e7435525c00108b3bc69af5)
    
    Bug: 752217
    Change-Id: I5278217d0dc0c663b274ac695078c3d3bfff28fd
    Reviewed-on: https://chromium-review.googlesource.com/600849
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491840}
    Reviewed-on: https://chromium-review.googlesource.com/602783
    Cr-Commit-Position: refs/branch-heads/3163@{#327}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  49. cc: Use render surface draw transform when occluding mask layer.
    
    We do not compute a mask layer's draw transform because the target is
    amubiguous for a mask layer. However when we compute mask layer's
    occlusion in PictureLayerImpl::AppendQuads, the code treats mask layer
    as a normal picture layer and uses default transform instead of the real
    transform.
    
    This CL makes PictureLayerImpl::AppendQuads use mask layer's render
    target's draw transform when computing occlusion.
    
    [email protected]
    
    (cherry picked from commit 7c9302475a38992e7555d7ce8496ea1da797f4bc)
    
    Bug: 747883
    Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
    Change-Id: Idc0de7674084df04df1f77e8726d3753f6877bf9
    Reviewed-on: https://chromium-review.googlesource.com/594680
    Reviewed-by: enne <[email protected]>
    Commit-Queue: Xianda Sun <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491514}
    Reviewed-on: https://chromium-review.googlesource.com/602781
    Reviewed-by: Xianda Sun <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#326}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  50. app_list: update searchbox result row, render text part
    
    changes:
    (1) Enable launcher search result title tags, this will fix
    crbug.com/751761.
    (2) Update card background color to #FAFAFC, not #FFFFFF.
    (3) update single line row (for omnibox non-url search result) and
    double lines row specs for render text.
    
    single line row specs: https://screenshot.googleplex.com/hBwCTmKNq4d
    double lines row specs: https://screenshot.googleplex.com/9pSZ2p2BVdo
    
    Test screenshot:
    screenshot 1: https://screenshot.googleplex.com/KQRCUAF0EXS
    screenshot 2: https://screenshot.googleplex.com/NxdAOS7GeMm
    
    [email protected]
    
    (cherry picked from commit 44018e43774bbd5869fddcede3f59fd7e26a8642)
    
    Test: tested with fullscreen app list flag
    Bug: 750690, 751761
    Change-Id: I4104d7b9056bfbc555ce2bb10867383157963c0a
    Reviewed-on: https://chromium-review.googlesource.com/596851
    Commit-Queue: Qiang(Joe) Xu <[email protected]>
    Reviewed-by: Steven Bennetts <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491598}
    Reviewed-on: https://chromium-review.googlesource.com/602686
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#325}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  51. cros: Fix stacked launcher animations.
    
    In the old version, launching the launcher and then rapidly entering
    text and deleting it multiple times caused the scheduled animations to
    build up causing the launcher to continue to animate between states long
    after text had stopped being entered/removed from the searchbox.
    
    I added a line to stop the current animation before scheduling another
    one, which prevents the behavior.
    
    [email protected]
    
    (cherry picked from commit d3b95d688db89d7b1eb44e487fbd21dc8debcc04)
    
    Bug: 750668
    Change-Id: I3134679ad2b378d21c5e953d50ee8909ffdc47fd
    Reviewed-on: https://chromium-review.googlesource.com/598743
    Reviewed-by: Yury Khmel <[email protected]>
    Commit-Queue: Alex Newcomer <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491591}
    Reviewed-on: https://chromium-review.googlesource.com/602521
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#324}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  52. Don't send the service worker startup hint if suggestions are disabled.
    
    This is controlled by the "Use a prediction service to help complete
    searches and URLs typed in the address bar" setting at
    chrome://settings/privacy.
    
    [email protected]
    
    (cherry picked from commit d5885b868cfb89e8e8841cff59448e1926d7338f)
    
    Bug: 751813
    Change-Id: Iedf25fbb95e4fe1133fa994843068b26b749e36b
    Reviewed-on: https://chromium-review.googlesource.com/598933
    Reviewed-by: Mark Pearson <[email protected]>
    Commit-Queue: Justin Donnelly <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491740}
    Reviewed-on: https://chromium-review.googlesource.com/602675
    Reviewed-by: Justin Donnelly <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#323}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  53. Revert breakage from  Issue 2960843003: Remove UMA.Debug.EnableCrashUpload.*
    
    We need to early-out *before* calling onDeferredStartup so that we don't
    unnecessarily invoke subclasses' implementation of onDeferredStartup
    BUG=749134
    [email protected]
    
    (cherry picked from commit 4c63a5002110cb17e715ccae921ff6a5d8df7cb4)
    
    Change-Id: I9b9b6aeda41c21e1b3c7166866dbf31102f716e1
    Reviewed-on: https://chromium-review.googlesource.com/587035
    Reviewed-by: Peter Kotwicz <[email protected]>
    Commit-Queue: Yaron Friedman <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#489709}
    Reviewed-on: https://chromium-review.googlesource.com/602480
    Reviewed-by: Yaron Friedman <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#322}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  54. Fix BlitFramebuffer RGB emulation on macOS.
    
    The fix for Issue 699566 regressed blits between user framebuffers on
    macOS when alpha:false and antialias:false. Only apply the workaround
    when blitting to the default WebGL back buffer.
    
    Tested by new conformance test
    conformance2/rendering/blitframebuffer-r11f-g11f-b10f.html from
    https://github.com/KhronosGroup/WebGL/pull/2469 .
    
    BUG=751206
    [email protected], [email protected]
    NOTRY=true
    
    (cherry picked from commit a758ce4a57c024753bb396f7b04ea66b92c2302e)
    
    Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
    Change-Id: I6025bcd562675318d6cd9d3fcc50aa90fa83642b
    Reviewed-on: https://chromium-review.googlesource.com/596679
    Reviewed-by: Zhenyao Mo <[email protected]>
    Reviewed-by: Kenneth Russell <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491300}
    Reviewed-on: https://chromium-review.googlesource.com/602689
    Cr-Commit-Position: refs/branch-heads/3163@{#321}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  55. Reland of "Add animated voice interaction icon."
    
    This reverts commit 1737b40ca5cf2c05f5b6c90d342dae31dbad09f3.
    
    Reason for revert:
    Reland after removing base::TimeTicks::since_origin() usage that
    does not exist in M61 branch.
    
    Original change's description:
    > Revert "Add animated voice interaction icon."
    >
    > This reverts commit 875aa3d7b80dd3d6a2f0a265d4ca1875b502abc6.
    >
    > Reason for revert:
    >
    > Breaks the M61 branch build
    >
    > cc -o obj/ash/ash/voice_interaction_overlay.o
    > ../../ash/shelf/voice_interaction_overlay.cc:170:43: error: no member named 'since_origin' in 'base::TimeTicks'
    >     uint64_t now = base::TimeTicks::Now().since_origin().InMilliseconds();
    >
    > Original change's description:
    > > Add animated voice interaction icon.
    > >
    > > BUG=b:62276007
    > > TEST=build flash locally, see animation as spec
    > > [email protected]
    > >
    > > (cherry picked from commit cc92f7aea52bd87500cab8538687da6e756aaed0)
    > >
    > > Change-Id: I5542b68e084fe465c2f8b424b521c8faef51f686
    > > Reviewed-on: https://chromium-review.googlesource.com/585245
    > > Commit-Queue: Xiaohui Chen <[email protected]>
    > > Reviewed-by: Mitsuru Oshima <[email protected]>
    > > Cr-Original-Commit-Position: refs/heads/master@{#490447}
    > > Reviewed-on: https://chromium-review.googlesource.com/595143
    > > Reviewed-by: Vladislav Kaznacheev <[email protected]>
    > > Cr-Commit-Position: refs/branch-heads/3163@{#198}
    > > Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
    >
    > [email protected],[email protected],[email protected]
    >
    > # Not skipping CQ checks because original CL landed > 1 day ago.
    >
    > Bug: b:62276007
    > Change-Id: Ie8e554ca79f054e0e4d18621402123455950aa9c
    > Reviewed-on: https://chromium-review.googlesource.com/597071
    > Reviewed-by: James Cook <[email protected]>
    > Cr-Original-Commit-Position: refs/branch-heads/3163@{#229}
    > Cr-Original-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}(cherry picked from commit 020cdf35035e30942aa34ca571fce561bff18cf6)
    > Reviewed-on: https://chromium-review.googlesource.com/598507
    > Commit-Queue: Xiaohui Chen <[email protected]>
    > Cr-Commit-Position: refs/heads/master@{#491521}
    
    [email protected]
    
    (cherry picked from commit 207b12dd6eb1be5f8cd5d68631e6f1e6ad5701b6)
    
    Bug: b:62276007
    Change-Id: I7c07a6edca4f853cd8e73664217c662eb29fc27d
    Reviewed-on: https://chromium-review.googlesource.com/598688
    Reviewed-by: Mitsuru Oshima <[email protected]>
    Commit-Queue: Xiaohui Chen <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491792}
    Reviewed-on: https://chromium-review.googlesource.com/602527
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#320}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  56. cros: Disable webstore search in favor of playstore
    
    When playstore search is enabled, disable webstore search.
    
    [email protected]
    
    (cherry picked from commit 782e893698632692daf1730a13e7d843acc8f330)
    
    Bug: 751834
    Change-Id: Ibcdcf7b90ae1c96debdc66854dfbc71f80c21421
    Reviewed-on: https://chromium-review.googlesource.com/599067
    Reviewed-by: Steven Bennetts <[email protected]>
    Commit-Queue: Alex Newcomer <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491534}
    Reviewed-on: https://chromium-review.googlesource.com/602449
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#319}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  57. cros: Launcher: Fixed OnMousePressed
    
    OnMousePressed now properly returns true if the event is consumed. This
    fixes the bug where unhandled mouse events were not propogating to the
    AppListView.
    
    [email protected]
    
    (cherry picked from commit 236d3a7e7eb6a4c0815b727b9c30bee059330e76)
    
    Bug: 744778
    Change-Id: I46cf1eb64994221b37ef186754d5409c5ddbd466
    Reviewed-on: https://chromium-review.googlesource.com/589819
    Reviewed-by: Yury Khmel <[email protected]>
    Reviewed-by: Dan Erat <[email protected]>
    Commit-Queue: Alex Newcomer <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491064}
    Reviewed-on: https://chromium-review.googlesource.com/602372
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#318}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  58. Mixed Licenses Enrollment Flow Let user select license type during enrollment flow if multiple licenses are available.
    
    BUG=725124
    [email protected]
    
    (cherry picked from commit 6233533c9a07a014d1a31079bbb4758992491786)
    
    Review-Url: https://codereview.chromium.org/2977033002
    Cr-Original-Commit-Position: refs/heads/master@{#491990}
    Change-Id: I681d3110fbc66ce71c7b97b3877872e989823466
    Reviewed-on: https://chromium-review.googlesource.com/602348
    Reviewed-by: Denis Kuznetsov <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#317}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  59. Add UI components for license type selection in ChromeOS login UI. Changes that would actually use them (enrollment screen) would come in next CL.
    
    BUG=725124
    CQ_INCLUDE_TRYBOTS=master.tryserver.chromium.linux:closure_compilation
    [email protected]
    
    (cherry picked from commit 3d1e27d07f9eb13b298556a877d4b54bcb94ca33)
    
    Review-Url: https://codereview.chromium.org/2959853003
    Cr-Original-Commit-Position: refs/heads/master@{#489529}
    Change-Id: I43b31245af351feed4d0ff9e793c36bfb698a3d6
    Reviewed-on: https://chromium-review.googlesource.com/602312
    Reviewed-by: Denis Kuznetsov <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#316}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  60. M61 merge: cros: Restore ash::Shell::GetActiveUserPrefService
    
    I removed it in https://chromium-review.googlesource.com/c/590356 but I
    need it in a new CL.
    
    Also, don't delete the underlying PrefService when switching users
    under mash. I now think it's better for the PrefService to be transiently
    stale than to be null during the mojo service connection.
    
    [email protected]
    
    (cherry picked from commit 6d51c918ac7eef16ba99e0798cb0dd51a50420b9)
    
    Bug: 752347
    Change-Id: Ic35e9a250be04ae7e521fb56f82fb731bc0fb779
    Reviewed-on: https://chromium-review.googlesource.com/601329
    Reviewed-by: Sam McNally <[email protected]>
    Commit-Queue: James Cook <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491906}
    Reviewed-on: https://chromium-review.googlesource.com/602451
    Reviewed-by: James Cook <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#315}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  61. Mojo: Ensure a RequestContext exists on async Channel error processing
    
    If a channel error is triggered from off-thread and posted to the IPC
    thread, we weren't ensuring that a RequestContext was in TLS. If the
    error lead to event notifications this would cause a nullptr deref.
    
    Fixes that.
    
    BUG=752137
    [email protected], [email protected]
    
    (cherry picked from commit 00d59f5db8d573a372605669ce6958ebced42db1)
    
    Change-Id: Iae167a712c9b7d8d853fe805c06afef36d2c4572
    Reviewed-on: https://chromium-review.googlesource.com/600291
    Reviewed-by: Ken Rockot <[email protected]>
    Commit-Queue: Ken Rockot <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491758}
    Reviewed-on: https://chromium-review.googlesource.com/602491
    Cr-Commit-Position: refs/branch-heads/3163@{#314}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  62. [Mac] Fix for Touch Bar Credit Card Autofill Crash
    
    The WebTextfieldTouchBarController observes the
    autofill popup window to display the autofill items.
    
    This CL makes sure that it stops observing the old
    popup before it observes a new one.
    
    (cherry picked from commit fcfda5c1e32c3a043ab9069de224b8b70d53f03d)
    
    Bug: 750570
    Change-Id: I8298a83f3cd1fae7363f6a3d16d9a15f24342cb7
    Reviewed-on: https://chromium-review.googlesource.com/596915
    Reviewed-by: Robert Sesek <[email protected]>
    Commit-Queue: Sarah Chan <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491415}
    Reviewed-on: https://chromium-review.googlesource.com/602063
    Reviewed-by: Sarah Chan <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#313}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  63. [Mac] Fix for Bookmark Editor Crash
    
    Using field editors is finicky especially when
    there's multiple textfields. Using one field editor
    is enough, so this CL combines the name and URL
    field editors into one.
    
    In addition, like what the
    AutocompleteTextFieldEditor is doing, the field
    editor's fieldEditor property will reset each time
    windowWillReturnFieldEditor:toObject: is called so
    that notifications will be sent properly.
    
    (cherry picked from commit 81112286430d0e761cc00915e6186330d5cf4155)
    
    Bug: 744211
    Change-Id: I2367d2abc788aaf1ef3daa037c879a222440015a
    Reviewed-on: https://chromium-review.googlesource.com/595214
    Reviewed-by: Avi Drissman <[email protected]>
    Commit-Queue: Sarah Chan <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491072}
    Reviewed-on: https://chromium-review.googlesource.com/602061
    Reviewed-by: Sarah Chan <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#312}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  64. [Merge to M61] Support domain rename to secondary domain on managed ChromeOS devices
    
    After enrolling a device, the domain name is commited to write-once memory and
    hence cannot just be changed. In order to support domain renames (eg. a customer
    decides to do rebranding and wants to display the new domain) we will send down
    a display_domain from the DMServer to the client, and in the UI we will display
    this new domain.
    
    [email protected]
    
    (cherry picked from commit 636b89d918ba972762f20263f1c6c9083ed42678)
    
    Bug: 548321
    Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
    Change-Id: I06b6ccf868b541e37d9c194180edcc3fd2b01c76
    Reviewed-on: https://chromium-review.googlesource.com/565574
    Reviewed-by: Chris Palmer <[email protected]>
    Reviewed-by: Achuith Bhandarkar <[email protected]>
    Reviewed-by: calamity <[email protected]>
    Reviewed-by: Steven Bennetts <[email protected]>
    Reviewed-by: Maksim Ivanov <[email protected]>
    Commit-Queue: Ivan Å andrk <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490355}
    Reviewed-on: https://chromium-review.googlesource.com/601992
    Reviewed-by: Ivan Å andrk <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#311}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  65. [Merge to M61] US International (PC) Keyboard layout was missing resourceId
    
    Symbol xkb:us:intl_pc:eng wasn't being properly decoded and was being displayed as something like the following in UI elements:
    _comp_ime_jkghodnilhceideoidjikpgommlajknkxkb:us:intl_pc:eng
    
    See linked bug for more info
    
    [email protected]
    
    (cherry picked from commit 34836cc78e7eb47c4f0fe708fe369171181184f8)
    
    Bug: 739809
    Change-Id: I95f20736b2de39cb86db956dc582d8a8bdf3b9bb
    Reviewed-on: https://chromium-review.googlesource.com/590227
    Reviewed-by: Ivan Å andrk <[email protected]>
    Reviewed-by: Steven Bennetts <[email protected]>
    Reviewed-by: Shu Chen <[email protected]>
    Commit-Queue: Ivan Å andrk <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490356}
    Reviewed-on: https://chromium-review.googlesource.com/601972
    Cr-Commit-Position: refs/branch-heads/3163@{#310}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  66. Do not fill passwords on passwords.google.com authentication form
    
    [email protected]
    
    (cherry picked from commit 334c6a3d2bf239c27b963357ef97ff53e2e5097d)
    
    Bug: 747828
    Change-Id: I1d531f2288017b64b6c43f43f855c02e6ad74732
    Reviewed-on: https://chromium-review.googlesource.com/588790
    Reviewed-by: Vasilii Sukhanov <[email protected]>
    Commit-Queue: Vadym Doroshenko <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490769}
    Reviewed-on: https://chromium-review.googlesource.com/601889
    Reviewed-by: Vadym Doroshenko <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#309}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  67. Introduce swipe gesture launch for lock screen note taking
    
    Adds SwipeDetector to MD TopHeaderBar, and hooks it up to observe touch
    events originating on new-note action launcher element and detect
    swipe gesture. If the SwipeDetector detects a swipe originating from
    the new-note action element, lock UI requests lock screen note taking
    flow.
    
    Bug:737067
    
    [email protected]
    
    (cherry picked from commit a540de62c987e3024774901e975a418aa30ea0b7)
    
    Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
    Change-Id: I560eef22365a37bfd3c5cbb8cb56f48eb44e62cf
    Reviewed-on: https://chromium-review.googlesource.com/582211
    Reviewed-by: Alexander Alekseev <[email protected]>
    Commit-Queue: Alexander Alekseev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490620}
    Reviewed-on: https://chromium-review.googlesource.com/601870
    Reviewed-by: Toni Barzic <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#308}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  68. When translate infobar's language tab truncated, do a scroll animation.
    
    When the translation infobar isn't long enough, the target
    language tab might be hidden and user would not know it exists.
    The current solution is to do a peeking animation, scrolls the tabs to
    the end to show its hidden part and then scrolls back to the front.
    
    After discussion, we decided to perform "scroll to the end" animation
    only and skip the "scroll back to the front" part.
    
    'Scrolling animation' consists of the following steps:
    1. wait for 1000ms
    2. scroll to the end in 300ms
    
    Demo (dummy text added for demo only):
    https://drive.google.com/open?id=0B1O0Z7eoZMuGN0VBR2ctbzhGejg
    
    [email protected]
    
    (cherry picked from commit 621a79eab22d443b16b9f6160e747ce6dbbbf832)
    
    Bug: 721936
    Change-Id: I7ba1415761791b2c8d2ab96c20bb871a65b56de6
    Reviewed-on: https://chromium-review.googlesource.com/590837
    Commit-Queue: Marti Wong <[email protected]>
    Reviewed-by: Matthew Jones <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491008}
    Reviewed-on: https://chromium-review.googlesource.com/600952
    Reviewed-by: Ramya Sharma <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#307}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  69. [merge-m60] Cater for unrevealed toolbars when showing the PageInfoBubble on Mac
    
    Currently, HasVisibleLocationBarForBrowser(..) just looks at the toolbar
    visibility preference. Instead, query the toolbar controller to see whether
    the toolbar has been revealed or not.
    
    As an added bonus, permission bubbles are now able to re-anchor to the
    toolbar/screen edge when revealing/hiding the toolbar in AppKit-
    initiated fullscreen.
    
    Bug: 749214
    Test: On Mac, Ensure View->"Always show toolbar in fullscreen" is unchecked.
    Press Ctrl+Cmd+f to enter fullscreen.
    Move the mouse to the top of the screen to reveal the toolbar and
    click the 'Page Info' button in the location bar. The dialog should
    open below the location bar rather than the top of the screen.
    
    [email protected]
    
    (cherry picked from commit f9cf932a6db81f79876f084b16426c14c0d2ffee)
    
    Change-Id: If7c0df7d3dc675f24cf467a2497ebe5c9cca7b8a
    Reviewed-on: https://chromium-review.googlesource.com/593382
    Reviewed-by: Ben Wells <[email protected]>
    Commit-Queue: Trent Apted <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490877}
    Reviewed-on: https://chromium-review.googlesource.com/601608
    Reviewed-by: Trent Apted <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#306}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  70. [merge-m60] Fix positioning of the Cocoa device chooser.
    
    This regressed in r469822, which corrected the way a class of bubbles
    detect whether the browser is fullscreen. Unfortunately, this particular
    bubble does not anchor properly on Mac when fullscreen was detected.
    
    The bubble should always anchor top-left (leading) so that it doesn't
    obscure the fullscreen bubble.
    
    Bug: 749410, 745291
    Test: At https://permission.site, click Fullscreen, then USB. The dialog
          should appear on-screen.
    
    [email protected]
    
    (cherry picked from commit debb20bc74b633b996516e2b5859da40e2e82440)
    
    Change-Id: Ieeca54305f0884cd9fe6ec3e7b1611332df08499
    Reviewed-on: https://chromium-review.googlesource.com/593368
    Reviewed-by: Giovanni Ortuño Urquidi <[email protected]>
    Commit-Queue: Trent Apted <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490841}
    Reviewed-on: https://chromium-review.googlesource.com/601629
    Reviewed-by: Trent Apted <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#305}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  71. Revert back NotificationView::TargetForRect
    
    This method was once removed crrev.com/12cad72cd, but it caused the issue.
    
    This patch reverts back the method and fixes the issue.
    
    [email protected]
    
    (cherry picked from commit cf18cf3b5c6e9ef66e9852c94dc5274a48960b60)
    
    Bug: 747809
    Change-Id: Iec144426af09161e009c96f8ddfb4ffe8f157552
    Reviewed-on: https://chromium-review.googlesource.com/584633
    Commit-Queue: Yoshiki Iguchi <[email protected]>
    Reviewed-by: Yuichiro Hanada <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#489886}
    Reviewed-on: https://chromium-review.googlesource.com/601607
    Reviewed-by: Yoshiki Iguchi <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#304}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  72. Streams API: Fix for SimpleQueue with full node
    
    SimpleQueue would erroneously set its "front" slot to undefined when shifting
    out the last element of a completely full back node.
    
    Modify push() to aggressively create a new back node immediately when it
    fills the back node. This permits shift() to consume the final element
    without breaking the invariant that the cursor position remains less
    than QUEUE_MAX_ARRAY_SIZE.
    
    Also add new tests for the cases of inserting then consuming one
    complete node, iterating over one complete node, and inserting and
    consuming a new element after consuming one complete node.
    
    This change was originally landed as part of
    https://chromium-review.googlesource.com/c/584649/ which was then
    reverted due to some missing slow test expectations.
    
    Due to an oversight, the reland in
    https://chromium-review.googlesource.com/c/593407/ was missing
    this change.
    
    This change also splits simple-queue.html up into 5 parts to stop it
    timing out on the MSAN bots.
    
    [email protected]
    
    (cherry picked from commit 9122293ecfc27753c649781333b4b23f1fa613a4)
    
    Bug: 743082
    Change-Id: I791f39002911bd6c727807fa37cf2ae19dad878f
    Reviewed-on: https://chromium-review.googlesource.com/593533
    Reviewed-by: Takeshi Yoshino <[email protected]>
    Commit-Queue: Adam Rice <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490880}
    Reviewed-on: https://chromium-review.googlesource.com/601134
    Reviewed-by: Adam Rice <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#303}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  73. Do not start a scan when the Default network changes unless both the Default network and the Tether network are disconnected.
    
    This is done to prevent a scan from starting when Ethernet and Tether are both connected, and then Ethernet is disconnected (but Tether remains connected).
    
    This CL also ensures a scan on login, regardless of whether or not the Default network is connected.
    
    [email protected]
    
    (cherry picked from commit 6c644529bf5dc1886a2dd0dbdc24f12029eeca08)
    
    Bug: 672263, 738542
    Change-Id: I062fdc3dc825df6a6e986db80964fa92732774f7
    Reviewed-on: https://chromium-review.googlesource.com/598940
    Commit-Queue: Leslie Watkins <[email protected]>
    Reviewed-by: Kyle Horimoto <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491834}
    Reviewed-on: https://chromium-review.googlesource.com/601421
    Cr-Commit-Position: refs/branch-heads/3163@{#302}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  74. Check Expect-CT preflight success before accessing response code
    
    While adding Expect-CT support for chrome://net-internals, I noticed that a
    crash can occur if the report URL results in a net error. This appears to be due
    to accessing the response code before checking the request status is
    success. Unfortunately, I can't reproduce the crash in a browser or unit test,
    perhaps because it's a race.
    
    [email protected]
    
    (cherry picked from commit 75a8d05e46ac1bf5b18c5966b2832132e72527ff)
    
    Bug: 751197
    Change-Id: I60c2b4debe19da9ef98f838ce2013747644a39d8
    Reviewed-on: https://chromium-review.googlesource.com/596514
    Reviewed-by: Mustafa Emre Acer <[email protected]>
    Commit-Queue: Emily Stark <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491161}
    Reviewed-on: https://chromium-review.googlesource.com/601411
    Reviewed-by: Emily Stark <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#301}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  75. Incrementing VERSION to 61.0.3163.33
    
    [email protected]
    
    Change-Id: I22016f8d078a5de55b2cece56f6ec6dcddcd56cd
    Reviewed-on: https://chromium-review.googlesource.com/601349
    Reviewed-by: [email protected] <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#300}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  76. Adding logo label in voice interaction OOBE
    
    - Add logo label in the OOBE flow
    - Fix the button focus in the OOBE flow
    
    BUG=747496
    [email protected]
    
    (cherry picked from commit f224ed393727538415b849b26a39abc566b003e6)
    
    Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
    Change-Id: I3b719698465826183e396a3b0d02bca7349b6283
    Reviewed-on: https://chromium-review.googlesource.com/597110
    Reviewed-by: Alexander Alekseev <[email protected]>
    Commit-Queue: Yue Li <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491588}
    Reviewed-on: https://chromium-review.googlesource.com/601095
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#299}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  77. [m61 merge] Avoid re-entrancy in the StreamRequest::OnRequestCompleteFailure, by posting a task to execute the callback instead of invoking it synchronously. Otherwise, if the callback calls into the session, ad things can happen. In addition, ensure that CancelRequest is called, even if the session is already closed.
    
    BUG=731617
    [email protected]
    
    (cherry picked from commit 9883ff66a084da1e00e188cd56855dcbcc4bc927)
    
    Change-Id: I6b8f0a8a0907b43076680bb2fd62bb3d21c04c4e
    Reviewed-on: https://chromium-review.googlesource.com/594933
    Reviewed-by: Zhongyi Shi <[email protected]>
    Commit-Queue: Ryan Hamilton <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490876}
    Reviewed-on: https://chromium-review.googlesource.com/600826
    Reviewed-by: Ryan Hamilton <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#298}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  78. Updates opacity of app list when dragging opened app list.
    
    Changes,
    Updates opacity of app list if dragging happened on the opened app list.
    Updates opacity of start page in peeking state during dragging.
    Since each page of app list can be dragged, remove the first page
    restriction in UpdateOpacity.
    
    After changes, when dragging the opened app list. The opacity of app
    list will also updates during dragging.
    
    [email protected]
    
    (cherry picked from commit 02f471a26b9a91fddddbca87de818f8b1d48d6b4)
    
    Bug: 748620
    Change-Id: Ic93edcaf28e422117bbdd3a5fa100ebcd5c9842d
    Reviewed-on: https://chromium-review.googlesource.com/594682
    Commit-Queue: min c <[email protected]>
    Reviewed-by: Steven Bennetts <[email protected]>
    Reviewed-by: Jenny Zhang <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491554}
    Reviewed-on: https://chromium-review.googlesource.com/601091
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#297}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  79. cros: X button should only clear query
    
    Changes:
    1. Clicking/touching the x button should clear the text and keep the
    searchbox active.
    2. Backspace clearing the last character should act the same as X
    button.
    3. Add unit tests for this behavior change.
    
    BUG=749361
    TEST=
    SearchBoxViewFullscreenTest.CloseButtonInvisibleByDefault
    SearchBoxViewFullscreenTest.CloseButtonVisibleAfterTyping
    SearchBoxViewFullscreenTest.SearchBoxEmptyAfterCloseButtonClicked
    SearchBoxViewFullscreenTest.SearchBoxActiveAfterCloseButtonClicked
    
    [email protected]
    
    (cherry picked from commit 02ca96925ccb743e83ad34bee8595e4a6eec8443)
    
    Change-Id: I6ad303bd222996c1aad343c17c08fb17f5667318
    Reviewed-on: https://chromium-review.googlesource.com/595256
    Commit-Queue: Weidong Guo <[email protected]>
    Reviewed-by: Steven Bennetts <[email protected]>
    Reviewed-by: James Cook <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491203}
    Reviewed-on: https://chromium-review.googlesource.com/600821
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#296}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  80. app_list: update icons for search result list views
    
    changes:
    (1) Define a TypeToVectorIcon used for app list, as for new launcher,
    the assets are different from AutocompleteMatch::TypeToVectorIcon.
    (2) update domain/search/history/bookmark/calculator icons.
    (3) update icon related layouts.
    
    screenshot 1: https://screenshot.googleplex.com/iiY03xRvK8q
    screenshot 2: https://screenshot.googleplex.com/DPK5Jjv6D8Q
    
    [email protected]
    
    (cherry picked from commit c7862264dbd9ebb035f3e10bf22f7093aac17470)
    
    specs: https://screenshot.googleplex.com/8Xvhv8svjbg
    Test: emulator test with/without fullscreen app list flag
    Bug: 748667
    Change-Id: I852eb4a1a204b22cf143dd2ccac11121fe9a8a37
    Reviewed-on: https://chromium-review.googlesource.com/590503
    Reviewed-by: Steven Bennetts <[email protected]>
    Commit-Queue: Qiang(Joe) Xu <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491103}
    Reviewed-on: https://chromium-review.googlesource.com/600820
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#295}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  81. cros: Added background blur for the launcher.
    
    Background blur is enabled behind the appropriate flag.
    The flag will be set for either certain devices or all devices
    based on blur performance.
    The flag will eventually be removed when blur is acceptable for
    all devices.
    
    [email protected]
    
    (cherry picked from commit 9d3e506124a83059c1f4457363003b947e6d111f)
    
    Bug: 739405
    Change-Id: If03bbc7bcfbeb5f8609def3b582a05113ef1571e
    Reviewed-on: https://chromium-review.googlesource.com/592289
    Commit-Queue: Alex Newcomer <[email protected]>
    Reviewed-by: Yury Khmel <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491091}
    Reviewed-on: https://chromium-review.googlesource.com/600819
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#294}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  82. Reland "Add tests for ArcPlayStoreAppSearchProvider."
    
    This relands commit cc2fbf55db543c262459dd9ae07bd7753f66e486,
    which was reverted by f87a709b2218049de5a5c533986f01a4fe0913d9.
    
    We create threads to load icons while initializing
    ArcPlayStoreSearchResult objects,  so we have to wait for
    them to finish, otherwise the test will be flaky and fail
    the base::MessageLoop::current()->IsIdleForTesting() test
    in test_browser_thread_bundle.cc.
    
    Bug=736552
    
    [email protected]
    
    (cherry picked from commit 7a7d7202fede9b1a48496c1ff0e02b36cb08fc1f)
    
    Change-Id: Icd054ea66367f3c28c3333522795e85475f40a1f
    Reviewed-on: https://chromium-review.googlesource.com/590027
    Reviewed-by: Luis Hector Chavez <[email protected]>
    Reviewed-by: Yury Khmel <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491077}
    Reviewed-on: https://chromium-review.googlesource.com/600865
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#293}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  83. [Merge to M61] Remove CloseSystemBubble in SysteTray and use CloseBubble instead.
    
    Merge this CL back to M61 on behalf of minch@.
    
    [email protected]
    (cherry picked from commit bab44af86b9eae11aa3938b404388312582a9d12)
    
    Bug: 741953
    Change-Id: If84dc5d589e3241a93c98da8f3faa86539ae3435
    Reviewed-on: https://chromium-review.googlesource.com/578233
    Reviewed-by: Mitsuru Oshima <[email protected]>
    Commit-Queue: min c <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490082}
    Reviewed-on: https://chromium-review.googlesource.com/600864
    Reviewed-by: Xiaoqian Dai <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#292}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  84. Reland "Remove hover on icons in launcher"
    
    This is a reland of 517fd5f96c8d19a31001193af6892992ee4d3be8
    Original change's description:
    > Remove hover on icons in launcher
    >
    > Changes:
    > Disable ImageShadowAnimator in fullscreen app list mode so that the icon
    > will not jump when hovered.
    >
    > BUG=748236
    >
    > Change-Id: Iba8c0717f7cdb132a28c4c21eb9add81a652e93a
    > Reviewed-on: https://chromium-review.googlesource.com/592335
    > Reviewed-by: Steven Bennetts <[email protected]>
    > Commit-Queue: Weidong Guo <[email protected]>
    > Cr-Commit-Position: refs/heads/master@{#490526}
    
    [email protected]
    
    (cherry picked from commit fd6a90946d898d4b0a2caee68fbcd99bd89aca86)
    
    Bug: 748236
    Change-Id: I2721590e0b42a03e87ca277a82b7929124704412
    Reviewed-on: https://chromium-review.googlesource.com/593188
    Reviewed-by: Steven Bennetts <[email protected]>
    Commit-Queue: Weidong Guo <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490800}
    Reviewed-on: https://chromium-review.googlesource.com/601209
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#291}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  85. Update opacity of the fullscreen app list during dragging from shelf.
    
    1. Update the app list background opacity based on the shelf's original opacity.
    Shelf changes to fully transparent if app list is opened.
    Relationship:
        Applist background opacity = (Opacity of app list) * t + (1 - t) * (opacity of shelf)
        t = gesture_drag_amount / (3.0 * shelfsize)
    
    2. Update the opacity of all the items in the app list.
    Includeing, searchbox view, suggested_apps_indicator, suggested_apps, all_apps_indicator,
                all apps in the first page, page switcher
    Formula:
    Opacity of item = (work_area_bottom - centroid of the item's screen bounds) / (2.0 * shelfsize)
    
    [email protected]
    
    (cherry picked from commit eafaa52e484c5ef28f4b24ee5ea9262175cb4122)
    
    Bug: 748620
    Change-Id: Ia1fc25628423fcc1ffad666319e04292837aae2c
    Reviewed-on: https://chromium-review.googlesource.com/585398
    Reviewed-by: Mitsuru Oshima <[email protected]>
    Reviewed-by: Mustafa Emre Acer <[email protected]>
    Reviewed-by: Jenny Zhang <[email protected]>
    Commit-Queue: min c <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490786}
    Reviewed-on: https://chromium-review.googlesource.com/600859
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#290}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  86. app_list: resize launcher search icon image to proper size
    
    context:
    In crbug.com/490597, 2x image is used for HiDPI blur issue. Then there
    is a CL "Migrate LauncherSearchResult to use SetBadgeIcon",
    https://codereview.chromium.org/1200543003, which I think it removes
    the proper handling of the size of this 2x loading.
    
    changes:
    When custom icon is loaded, resize it to proper size.
    
    HiDPI screenshot: https://screenshot.googleplex.com/2rWk8akUx99
    
    [email protected]
    
    (cherry picked from commit 5d2ce5fc2424a8a9fb2d866557e2c3acbe0ae7ce)
    
    Test: tested that it works fine now,
    screenshot: https://screenshot.googleplex.com/u9BapUpenhu
    Bug: 723021
    Change-Id: If18a59e7aaeed48e9a0e88409f8672d057eb986a
    Reviewed-on: https://chromium-review.googlesource.com/592415
    Reviewed-by: Steven Bennetts <[email protected]>
    Reviewed-by: Yuki Awano <[email protected]>
    Commit-Queue: Qiang(Joe) Xu <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490707}
    Reviewed-on: https://chromium-review.googlesource.com/600858
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#289}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  87. cros: Change Assistant pen timing
    
    Start the animation a bit earlier, invoke the Assistant a bit later.
    (see the bug for details).
    
    [email protected]
    
    (cherry picked from commit 2d0b7e1a609c8529a2a2f4073b50b35c3dc18364)
    
    Bug: 751752
    Change-Id: Ic141fc6a1955f49fd26a7eab9e7128d0c1197fd0
    Reviewed-on: https://chromium-review.googlesource.com/598774
    Reviewed-by: James Cook <[email protected]>
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491553}
    Reviewed-on: https://chromium-review.googlesource.com/600856
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#288}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  88. fix scale issue in voice interaction context.
    
    BUG=b:64029031
    TEST=None
    [email protected]
    
    (cherry picked from commit 3b4de3708118eeeb6855b74883fbbdd3128cf16f)
    
    Change-Id: I3b14f8f6f2fc3867548578937334a288b33e06ed
    Reviewed-on: https://chromium-review.googlesource.com/597169
    Reviewed-by: Scott Violet <[email protected]>
    Reviewed-by: Luis Hector Chavez <[email protected]>
    Commit-Queue: Muyuan Li <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491536}
    Reviewed-on: https://chromium-review.googlesource.com/601189
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#287}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  89. cc: Detect raster sources with sRGB-only content
    
    In enabling the color correct rendering feature, we are now
    converting all sRGB images to the output device color space.
    Before enabling this feature, these images had no conversion
    applied.
    
    Track the fraction of images and pixels on each raster source
    that are in this category of "requires color conversion when
    previously none was required" and record it in a histogram.
    
    If it is the case that many raster sources have exclusively
    sRGB content, then we may want to consider rasterizing
    such layers in sRGB and doing color conversion at compositing
    time.
    
    Query image color spaces in the discardable image map generator,
    and record statistics about the percent of pixels and images that
    are sRGB versus non-sRGB. Record a histogram of both of these
    statistics.
    
    [email protected]
    
    (cherry picked from commit e7ca16787f13fff437875b4446d25b2fc5b5776f)
    
    Bug: 719735
    Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
    Change-Id: Ic180b46627987ac6badf96ddba61d0e5e9a19c25
    Reviewed-on: https://chromium-review.googlesource.com/580309
    Commit-Queue: ccameron chromium <[email protected]>
    Reviewed-by: Steven Holte <[email protected]>
    Reviewed-by: Vladimir Levin <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#489928}
    Reviewed-on: https://chromium-review.googlesource.com/601058
    Reviewed-by: ccameron chromium <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#286}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  90. cros: Ensure password view has focus when showing lock screen.
    
    [email protected]
    
    (cherry picked from commit ef5c4de93592d5b4dc47000143a9e2e2ad151d52)
    
    Bug: 725622
    Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
    Change-Id: Iaf48cb74746a466f5856edc953972e9362b19ebc
    Reviewed-on: https://chromium-review.googlesource.com/590171
    Commit-Queue: Jacob Dufault <[email protected]>
    Reviewed-by: Dan Erat <[email protected]>
    Reviewed-by: Alexander Alekseev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490531}
    Reviewed-on: https://chromium-review.googlesource.com/601123
    Reviewed-by: Jacob Dufault <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#285}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  91. cros: Fix laser pointer tray icon color
    
    The 2x icon had incorrect values in the PATH_COLOR_ARGB command.
    Copied the correct values (30% opacity white) from the 1x version.
    
    [email protected], [email protected]
    
    (cherry picked from commit eb461105b8e7dedcc291e4629d11e13cd3cc5351)
    
    Bug: 751725
    Change-Id: I582d393c22201678c16c9ba9a819850e5add01de
    Reviewed-on: https://chromium-review.googlesource.com/598807
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491471}
    Reviewed-on: https://chromium-review.googlesource.com/600710
    Cr-Commit-Position: refs/branch-heads/3163@{#284}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  92. cros: Compute metalayer bounds correctly on non-default resolutions
    
    The previous implementation only used the device scale to convert
    from DIP to the screenshot bitmap coordinate space, which did
    not take into account the scaling applied when the user presses
    Ctrl+Shift+Plus or Minus.
    
    The new implementation deduces the correct scale from the window's
    transform.
    
    Added unit tests for gesture recognition, with regular, rotated
    and scaled displays.
    
    Bounding boxes are now computed and kept as gfx::RectF and rounded
    to gfx::Rect just once at the last possible moment. This ensures
    predictable rounding and makes it possible to write readable
    that do not have to work around quirky implementation details.
    
    [email protected]
    
    (cherry picked from commit 272792ed6fbcb05ee9f2e522fdc1695aab3393ae)
    
    Bug: 750816
    Change-Id: I0ef3fb258917c72220c31b8c0cf37ddb43037958
    Reviewed-on: https://chromium-review.googlesource.com/595069
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Reviewed-by: James Cook <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491468}
    Reviewed-on: https://chromium-review.googlesource.com/600709
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#283}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  93. Fix Password Protection finch feature mismatch
    
    kPasswordFieldOnFocusPinging feature was mistakenly used in checking pinging
    status for password reuse study.
    As a result, the effective user pool of password reuse study is the same as
    password on focus study (a.k.a SBER and no incognito).
    
    [email protected]
    
    (cherry picked from commit c8d36f808bba639cbf37d1bf550c7036419cdbe8)
    
    Bug: 750410
    Change-Id: I2579f5b5119ccfb68074b735d814dc3c8efa4a75
    Reviewed-on: https://chromium-review.googlesource.com/592790
    Commit-Queue: Jialiu Lin <[email protected]>
    Reviewed-by: Nathan Parker <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490921}
    Reviewed-on: https://chromium-review.googlesource.com/601087
    Reviewed-by: Jialiu Lin <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#282}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  94. Remove [Search+Space] shortcut for voice interaction
    
    BUG=750304
    TEST=locally build and push to device, see shortcut changes
    [email protected]
    
    (cherry picked from commit fc61d60d2866e5cc6d6482c71c07a3d283a4c525)
    
    Change-Id: I3d96a3f2a1cf77a505a2ec8e20429e4e0acc2e67
    Reviewed-on: https://chromium-review.googlesource.com/592080
    Reviewed-by: Mitsuru Oshima <[email protected]>
    Reviewed-by: Achuith Bhandarkar <[email protected]>
    Commit-Queue: Xiaohui Chen <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490886}
    Reviewed-on: https://chromium-review.googlesource.com/601067
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#281}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  95. Fixing build break.
    
    [email protected]
    
    Change-Id: Ib2482c5b93a09541430487b7e2e11a37b58baba8
    Reviewed-on: https://chromium-review.googlesource.com/601015
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#280}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  96. DevTools: De-duplicate service worker's clients
    
    [email protected]
    
    (cherry picked from commit e0d86cf9a6ea4c7601070981e09eed64bfef1e73)
    
    Bug: 750767
    Change-Id: I7acea758a3142f599326eb745ae16db5f020b06b
    Reviewed-on: https://chromium-review.googlesource.com/594633
    Commit-Queue: Paul Irish <[email protected]>
    Reviewed-by: Pavel Feldman <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491063}
    Reviewed-on: https://chromium-review.googlesource.com/600995
    Reviewed-by: Paul Irish <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#279}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  97. ChromeOS OOBE: fix translation of network status.
    
    Network statuses in network list were not updated after language change.
    This CL fixes it.
    
    [email protected]
    
    (cherry picked from commit c257d879c2c3fefdfa2345dbfd45c2dc4d5d2292)
    
    Bug: 750988
    Change-Id: Iff30dae38e8f9e7331606550f229ddbdf3faf5fc
    Reviewed-on: https://chromium-review.googlesource.com/594952
    Commit-Queue: Alexander Alekseev <[email protected]>
    Reviewed-by: Steven Bennetts <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491547}
    Reviewed-on: https://chromium-review.googlesource.com/600813
    Reviewed-by: Alexander Alekseev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#278}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  98. ChromeOS OOBE: update welcome screen illustrations.
    
    [email protected]
    
    (cherry picked from commit 3b27f0326c66d07ca72c5c197bbb28e4d7dc68fb)
    
    Bug: 705566
    Cq-Include-Trybots: master.tryserver.chromium.linux:closure_compilation
    Change-Id: I664ac7f84cf422e7a1947566b6fe23a47c576bb1
    Reviewed-on: https://chromium-review.googlesource.com/598509
    Reviewed-by: Wenzhao (Colin) Zang <[email protected]>
    Commit-Queue: Alexander Alekseev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491665}
    Reviewed-on: https://chromium-review.googlesource.com/600993
    Reviewed-by: Alexander Alekseev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#277}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  99. Incrementing VERSION to 61.0.3163.32
    
    [email protected]
    
    Change-Id: I180ae67b4d6618217a1b4d2f82ea6e42adf5cc1c
    Reviewed-on: https://chromium-review.googlesource.com/600738
    Reviewed-by: [email protected] <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#276}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  100. Unit-testing AnswerCardSearchProvider.
    
    Removed OpenURLFromTab from the provider, as it’s not related to its
    mission to produce search results.
    
    Bug=712331
    
    [email protected]
    
    (cherry picked from commit a138ec706839c1f162b0dd4e7b916bce57344ef8)
    
    Review-Url: https://codereview.chromium.org/2947283002
    Cr-Original-Commit-Position: refs/heads/master@{#491631}
    Change-Id: I4c75c41f231b0dba8094741756cbef3c7bedb098
    Reviewed-on: https://chromium-review.googlesource.com/600730
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#275}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  101. Not eating Space button.
    
    Answer card eats Space, so that pressing space while it's selected
    doesn't add space to the search box. So if you start typing a query with
    a space, you might be not able to enter space.
    
    Other kinds of results don't eat space.
    
    Now not eating Space.
    
    Bug=712331
    
    [email protected]
    
    (cherry picked from commit 379beabb8ebfd0ba6c3d76b45082a5f63847de13)
    
    Change-Id: If7bb4224d6d2597bd50e31eececc184d7f401904
    Reviewed-on: https://chromium-review.googlesource.com/595154
    Reviewed-by: Yury Khmel <[email protected]>
    Commit-Queue: Vadim Tryshev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491583}
    Reviewed-on: https://chromium-review.googlesource.com/600728
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#274}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  102. Escaping query param
    
    Entering guns&roses currently searches for "guns" only because &roses is
    treated as another query param.
    
    Now escaping the query value.
    
    I had to convert the query to UTF8 so that I could pass it to the
    escaping function.
    
    I checked that Unicode characters are not lost, and searching for 猫
    still finds a cat.
    
    Bug=712331
    
    [email protected]
    
    (cherry picked from commit c0061db18c047f84e7065ba57706e6638e02014f)
    
    Change-Id: I1b8359e9cb24efb00e1d38322e0ef4c20747cf93
    Reviewed-on: https://chromium-review.googlesource.com/595160
    Reviewed-by: Yury Khmel <[email protected]>
    Commit-Queue: Vadim Tryshev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491505}
    Reviewed-on: https://chromium-review.googlesource.com/600727
    Reviewed-by: Vadim Tryshev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#273}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  103. Handle failed fetches of sample counts vectors.
    
    [email protected]
    
    (cherry picked from commit 101ec73abc36f730b291b4204077978a2f66a2f5)
    
    Bug: 748433
    Change-Id: I9f9d6ac4898e7c3bbac79dbbb37c16cf5e430d2d
    Reviewed-on: https://chromium-review.googlesource.com/594635
    Reviewed-by: Steven Holte <[email protected]>
    Commit-Queue: Brian White <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491024}
    Reviewed-on: https://chromium-review.googlesource.com/600490
    Reviewed-by: Brian White <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#272}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  104. Disable ContentSuggestionsVideoOverlay by default.
    
    Bug: 728551
    Change-Id: I36ffeee59ed4b73e1682ed74e6c309ae247b7647
    Reviewed-on: https://chromium-review.googlesource.com/600231
    Reviewed-by: Michael van Ouwerkerk <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#271}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  105. Disable ContentSuggestionsLargeThumbnail by default.
    
    Bug: 734101
    Change-Id: Ifdf26130d068a6faf6813fbc380ff70cd16e1c85
    Reviewed-on: https://chromium-review.googlesource.com/600229
    Reviewed-by: Michael van Ouwerkerk <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#270}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  106. [Cronet] Adjust some tests to run on fast devices/emulators.
    
    Some devices/emulators run quickly so requests take less than 1ms,
    which causes some test failures.  Fix them using MetricsTestUtil.assertAfter()
    and also clean up copies of that code.
    
    [email protected]
    
    (cherry picked from commit 03efa26cafe6f71cdd37d04fe40d264761bb9d8d)
    
    Bug: 751184
    Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester
    Change-Id: Icdce80479a887276b8921b4168a96c65b12d0143
    Reviewed-on: https://chromium-review.googlesource.com/596073
    Commit-Queue: Paul Jensen <[email protected]>
    Reviewed-by: Miriam Gershenson <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491076}
    Reviewed-on: https://chromium-review.googlesource.com/600107
    Reviewed-by: Paul Jensen <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#269}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  107. v8binding: Fixes the order of ScriptState check in callback interfaces.
    
    Checks the ScriptState before the use of the context (ExecutionContext::
    From uses a context).
    
    [email protected]
    
    (cherry picked from commit df80c6ec248b494ded0c32f0c5d3b1d1ae6c24a0)
    
    Bug: 750501
    Change-Id: Iae25998060667beb32c21fc3a33f2caf27b0bd21
    Reviewed-on: https://chromium-review.googlesource.com/593532
    Reviewed-by: Kentaro Hara <[email protected]>
    Commit-Queue: Yuki Shiino <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490893}
    Reviewed-on: https://chromium-review.googlesource.com/599790
    Reviewed-by: Yuki Shiino <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#268}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  108. Set dispatcher in NTPToolbarController
    
    The dispatcher wasn't set anymore due to some refactoring.
    This CL sets it back.
    
    [email protected]
    
    (cherry picked from commit 0178eb9ac4a52b019e87a724b67a13d2b524c9cb)
    
    Bug: 749488
    Change-Id: I94a7d738721720dc3e2814f94d9658cd152debaa
    Reviewed-on: https://chromium-review.googlesource.com/593567
    Reviewed-by: Mark Cogan <[email protected]>
    Reviewed-by: Justin Cohen <[email protected]>
    Commit-Queue: Gauthier Ambard <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491286}
    Reviewed-on: https://chromium-review.googlesource.com/599548
    Reviewed-by: Gauthier Ambard <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#267}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  109. Incrementing VERSION to 61.0.3163.31
    
    [email protected]
    
    Change-Id: I29015cd89825747c7f9446c7d37d89c9934f75a8
    Reviewed-on: https://chromium-review.googlesource.com/599370
    Reviewed-by: [email protected] <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#266}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  110. On dual-GPU macs, blacklist MSAA for both GPUs if either is Intel
    
    Because Skia blacklists MSAA on Intel GPUs independently from Chrome, we
    can end up in situations on dual-GPU Macs where CC thinks that
    MSAA is available while Skia has it blacklisted. In order to avoid
    these situations, we will blacklist MSAA for both GPUs (on the
    Chrome side) if we want to blacklist either.
    
    [email protected]
    
    (cherry picked from commit 6a22805ce7eb9cd90f4eb790f70a7e5490971a28)
    
    Bug: 749438, 751919
    Cq-Include-Trybots: master.tryserver.chromium.android:android_optional_gpu_tests_rel;master.tryserver.chromium.linux:linux_optional_gpu_tests_rel;master.tryserver.chromium.mac:mac_optional_gpu_tests_rel;master.tryserver.chromium.win:win_optional_gpu_tests_rel
    Change-Id: I537ef3286f1a83330c58ae8e43e7133752575509
    Reviewed-on: https://chromium-review.googlesource.com/599224
    Reviewed-by: Victor Miura <[email protected]>
    Commit-Queue: Eric Karl <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491646}
    Reviewed-on: https://chromium-review.googlesource.com/599076
    Reviewed-by: Eric Karl <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#265}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  111. reland: [merge to m61] Force use of and cache render surface.
    
    reland: merge to m61 on behalf of wutao@
    
    Force use of render surface and cache it when there is no damage from
    contributing contents. This will allow us to create a caching mechanism
    that is simple to maintain and provides the benefits needed to make the
    Chrome OS UI fast.
    
    TBR: [email protected], [email protected], [email protected],
    [email protected], [email protected]
    BUG=708513
    TEST=manual && new damage_tracker_unittests && surface_aggregator_unittests
    CQ_INCLUDE_TRYBOTS=master.tryserver.blink:linux_trusty_blink_rel
    
    (cherry picked from commit 36850738fee2ff9af2f0207353d1d3b00ad3f5df)
    
    Review-Url: https://codereview.chromium.org/2873593002
    Cr-Original-Commit-Position: refs/heads/master@{#490671}
    Cq-Include-Trybots: master.tryserver.blink:linux_trusty_blink_rel
    Change-Id: If3622cb872d86ea931f43680897c68a92d42263b
    Reviewed-on: https://chromium-review.googlesource.com/599369
    Reviewed-by: Qiang(Joe) Xu <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#264}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  112. chromeos: Fix regression in Android note-taking app list.
    
    Fix a bug where the note-taking app list spins forever due
    to intent filter changes not being observed for newly-added
    profiles.
    
    Bug: 748763
    Change-Id: I094f989ef986d8a8eaf2f2492d46a3c18ea73159
    Reviewed-on: https://chromium-review.googlesource.com/594893
    Reviewed-by: Hidehiko Abe <[email protected]>
    Commit-Queue: Dan Erat <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491201}(cherry picked from commit b6d659cdf82f747f75cb3f44abfaebc31adbc1d1)
    Reviewed-on: https://chromium-review.googlesource.com/598508
    Reviewed-by: Dan Erat <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#263}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  113. Fix AutofillAgent::DoAcceptDataListSuggestion string splicing.
    
    Store the intermediate value in a string variable rather than using a
    temporary.
    
    Adds a browser test for DoAcceptDataListSuggestion that would've failed.
    
    [email protected]
    
    (cherry picked from commit 93bc1587148b876300ef5d9f4700fa55db00c194)
    
    Bug: 749451
    Change-Id: I0bb14330ed6f0e9e110b8abedaec06e3e3d05317
    Reviewed-on: https://chromium-review.googlesource.com/593428
    Commit-Queue: Matt Giuca <[email protected]>
    Reviewed-by: Vaclav Brozek <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490853}
    Reviewed-on: https://chromium-review.googlesource.com/598659
    Reviewed-by: Matt Giuca <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#262}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  114. Implement prediction in HighlighterView
    
    Reuse FastInkPoints recently extracted from
    ash::LaserPointerView.
    
    [email protected]
    
    (cherry picked from commit 1c1bc3b3e2fe8c5d773b23d6137c67f75402b922)
    
    Bug: 748726
    Change-Id: I5d8651f6179440a7438a62db48a7fa867f6a1ea4
    Reviewed-on: https://chromium-review.googlesource.com/587613
    Reviewed-by: James Cook <[email protected]>
    Reviewed-by: David Reveman <[email protected]>
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491112}
    Reviewed-on: https://chromium-review.googlesource.com/599449
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#261}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  115. Add UMA enum for Assistant palette tool
    
    The internal name of the tool is "Metalayer"
    (PaletteTrayOptions::PALETTE_METALAYER, see
    ash/system/palette/palette_ids.h)
    
    [email protected]
    
    (cherry picked from commit 2b78b7f8f03cdb6e050db9a3d714ce36a48b849b)
    
    Bug: 750911
    Change-Id: I56acd0a5e7571b9fab25d0d53053dca8680916d2
    Reviewed-on: https://chromium-review.googlesource.com/595168
    Reviewed-by: Vadim Tryshev <[email protected]>
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#491039}
    Reviewed-on: https://chromium-review.googlesource.com/599448
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#260}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  116. Add rounded corners to highlighter stroke
    
    Draw the outline of each segment with 4dp
    stroke and round joints.
    
    [email protected]
    
    (cherry picked from commit b442dfacc61a91a2fc7ee48ab641c367f2b7b29f)
    
    Bug: 750171
    Change-Id: I5db66e65ed4d526d890486c7b96c7379453b70b7
    Reviewed-on: https://chromium-review.googlesource.com/591610
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Reviewed-by: James Cook <[email protected]>
    Reviewed-by: David Reveman <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490838}
    Reviewed-on: https://chromium-review.googlesource.com/599153
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#259}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  117. Better pointer prediction for short trajectories
    
    When there are only source 2 points available,
    predict zero acceleration.
    
    When there are only source 3 points available,
    predict zero jerk.
    
    [email protected]
    
    (cherry picked from commit 28cc3784cd55890ef97c757a90c1d91e07734576)
    
    Bug: 748733
    Change-Id: I6bbedc1479618b6719b63667160f4a82effbbd0c
    Reviewed-on: https://chromium-review.googlesource.com/585172
    Reviewed-by: David Reveman <[email protected]>
    Reviewed-by: Mitsuru Oshima <[email protected]>
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#490138}
    Reviewed-on: https://chromium-review.googlesource.com/599447
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#258}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  118. Fix inverted tray icons for stylus tools
    
    Remove ROUND_RECT from metalayer icons.
    Copy the structure from the 1x laser pointer icon
    to the 2x version.
    
    [email protected]
    
    (cherry picked from commit 9191b87bd02343147139fb3f3e320d8bec5b8999)
    
    Bug: 748750
    Change-Id: Id6fba141a0a3fa9610cafe92fc4818ede0982399
    Reviewed-on: https://chromium-review.googlesource.com/585643
    Reviewed-by: Mitsuru Oshima <[email protected]>
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#489988}
    Reviewed-on: https://chromium-review.googlesource.com/599408
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#257}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  119. Reland: Extract prediction logic from LaserPointerView
    
    (Added a missing include that MSAN bots seem to require)
    
    Renamed LaserPointerPoints to FastInkPoints and
    move it under ash/fast_ink.
    
    Moved prediction logic into FastInkPoints.
    
    Added a unit test for prediction.
    
    This should allow other tools such as highlighter
    to use the common prediction logic.
    
    [email protected], [email protected]
    
    (cherry picked from commit fe69015356c180b84ba1f520626b4772957a088a)
    
    Bug: 743083
    Change-Id: Iaa626a00c01188fd4aae468b47c0e44e8f29235b
    Reviewed-on: https://chromium-review.googlesource.com/585267
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#489428}
    Reviewed-on: https://chromium-review.googlesource.com/599407
    Cr-Commit-Position: refs/branch-heads/3163@{#256}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  120. Reland: Implement metalayer palette tool in ash.
    
    Reland of https://chromium-review.googlesource.com/c/558467/
    (fixed uninitialed member)
    
    [email protected]
    
    (cherry picked from commit 6d6aaff4718e11989af7df332b975a116f0150ec)
    
    Bug: b:63142451
    Change-Id: Ibef3f200bf7eefc9e11cb66d68eabee56263431d
    Reviewed-on: https://chromium-review.googlesource.com/581752
    Reviewed-by: Mitsuru Oshima <[email protected]>
    Commit-Queue: Vladislav Kaznacheev <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#488851}
    Reviewed-on: https://chromium-review.googlesource.com/599367
    Reviewed-by: Vladislav Kaznacheev <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#255}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}
  121. Migrate ValueStoreFrontend to TaskScheduler API
    
    This migrates value_store_frontend.cc and related unit test code from
    browser FILE thread to the singleton SequencedTaskRunner used by the
    rest of extensions store code. I hope that this should fix crbug/746155
    which I think could be caused by accessing the store backend from two
    concurrent threads.
    
    One tricky part of the change is getting rid of the test code in
    rules_registry_with_cache_unittest.cc that the ValueStore is lazily
    created when reading/writing. This change didn't change anything
    about how the ValueStore is created but I think the original assumption
    was wrong and happened to work only because there wasn't a true
    multi-threading. The FILE browser thread was actually mapped to the same
    physical thread so the store wasn't created until spinning the RunLoop.
    In fact it seems the store creation is being initiated in the test
    SetUp, and now with the true backend thread that finishes before the test
    body starts running.
    
    BUG=746155, 689520
    [email protected]
    
    (cherry picked from commit ca9325a63d9fa6106969032a35344bd7aa493299)
    
    Change-Id: Ida6b2bd6ca5cb4ed32fc7d70d2f949bca6085bb3
    Reviewed-on: https://chromium-review.googlesource.com/578692
    Reviewed-by: Devlin <[email protected]>
    Commit-Queue: Stanislav Chiknavaryan <[email protected]>
    Cr-Original-Commit-Position: refs/heads/master@{#489136}
    Reviewed-on: https://chromium-review.googlesource.com/599268
    Reviewed-by: Stanislav Chiknavaryan <[email protected]>
    Cr-Commit-Position: refs/branch-heads/3163@{#254}
    Cr-Branched-From: ff259bab28b35d242e10186cd63af7ed404fae0d-refs/heads/master@{#488528}