BASELINE: Update Chromium to 52.0.2743.76 and Ninja to 1.7.1

Change-Id: I382f51b959689505a60f8b707255ecb344f7d8b4
Reviewed-by: Michael Brüning <michael.bruning@qt.io>

5 files changed, 32 insertions, 12 deletions

diff --git a/chromium/ui/base/cocoa/appkit_utils.h b/chromium/ui/base/cocoa/appkit_utils.h
index 3f1b446349d..bb11e078804 100644
--- a/chromium/ui/base/cocoa/appkit_utils.h
+++ b/chromium/ui/base/cocoa/appkit_utils.h
@@ -42,6 +42,9 @@ UI_BASE_EXPORT void DrawNinePartImage(NSRect frame,
 UI_BASE_EXPORT void WindowTitlebarReceivedDoubleClick(NSWindow* window,
                                                       id sender);
 
+// Whether a force-click event on the touchpad should invoke Quick Look.
+UI_BASE_EXPORT bool ForceClickInvokesQuickLook();
+
 }  // namespace ui
 
 #endif  // UI_BASE_COCOA_APPKIT_UTILS_H
diff --git a/chromium/ui/base/cocoa/appkit_utils.mm b/chromium/ui/base/cocoa/appkit_utils.mm
index ce672699f5d..1b0a61b2060 100644
--- a/chromium/ui/base/cocoa/appkit_utils.mm
+++ b/chromium/ui/base/cocoa/appkit_utils.mm
@@ -9,12 +9,6 @@
 
 namespace {
 
-// Gets an NSImage given an image id.
-NSImage* GetImage(int image_id) {
-  return ui::ResourceBundle::GetSharedInstance().GetNativeImageNamed(image_id)
-      .ToNSImage();
-}
-
 // Double-click in window title bar actions.
 enum class DoubleClickAction {
   NONE,
@@ -22,6 +16,20 @@ enum class DoubleClickAction {
   MAXIMIZE,
 };
 
+// Values of com.apple.trackpad.forceClick corresponding to "Look up & data
+// detectors" in System Preferences -> Trackpad -> Point & Click.
+enum class ForceTouchAction {
+  NONE = 0,        // Unchecked or set to "Tap with three fingers".
+  QUICK_LOOK = 1,  // Set to "Force Click with one finger".
+};
+
+// Gets an NSImage given an image id.
+NSImage* GetImage(int image_id) {
+  return ui::ResourceBundle::GetSharedInstance()
+      .GetNativeImageNamed(image_id)
+      .ToNSImage();
+}
+
 // The action to take when the user double-clicks in the window title bar.
 DoubleClickAction WindowTitleBarDoubleClickAction() {
   // El Capitan introduced a Dock preference to configure the window title bar
@@ -95,4 +103,10 @@ void WindowTitlebarReceivedDoubleClick(NSWindow* window, id sender) {
   }
 }
 
+bool ForceClickInvokesQuickLook() {
+  return [[NSUserDefaults standardUserDefaults]
+             integerForKey:@"com.apple.trackpad.forceClick"] ==
+         static_cast<NSInteger>(ForceTouchAction::QUICK_LOOK);
+}
+
 }  // namespace ui
diff --git a/chromium/ui/base/cocoa/base_view.mm b/chromium/ui/base/cocoa/base_view.mm
index 9642fbe1a81..ef3eb87f791 100644
--- a/chromium/ui/base/cocoa/base_view.mm
+++ b/chromium/ui/base/cocoa/base_view.mm
@@ -60,8 +60,8 @@ NSString* kSelectionDirection = @"Chromium.kSelectionDirection";
   // http://crbug.com/176725 / http://openradar.appspot.com/radar?id=2773401 .
   // Work around it by reinstalling the tracking area after window resize.
   // This AppKit bug is fixed on Yosemite, so we only apply this workaround on
-  // 10.7 to 10.9.
-  if (base::mac::IsOSMavericksOrEarlier() && base::mac::IsOSLionOrLater()) {
+  // 10.9.
+  if (base::mac::IsOSMavericks()) {
     [self disableTracking];
     [self enableTracking];
   }
diff --git a/chromium/ui/base/cocoa/constrained_window/constrained_window_animation_unittest.mm b/chromium/ui/base/cocoa/constrained_window/constrained_window_animation_unittest.mm
index 995d042ec93..d7637190c8b 100644
--- a/chromium/ui/base/cocoa/constrained_window/constrained_window_animation_unittest.mm
+++ b/chromium/ui/base/cocoa/constrained_window/constrained_window_animation_unittest.mm
@@ -2,10 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+#import "ui/base/cocoa/constrained_window/constrained_window_animation.h"
+
+#include <memory>
+
 #include "base/mac/scoped_nsobject.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_pump_mac.h"
-#import "ui/base/cocoa/constrained_window/constrained_window_animation.h"
 #import "ui/gfx/test/ui_cocoa_test_helper.h"
 
 // This class runs an animation for exactly two frames then end it.
@@ -13,7 +15,7 @@
     : NSObject<NSAnimationDelegate> {
  @private
   CGFloat frameCount_;
-  scoped_ptr<base::MessagePumpNSRunLoop> message_pump_;
+  std::unique_ptr<base::MessagePumpNSRunLoop> message_pump_;
 }
 
 - (void)runAnimation:(NSAnimation*)animation;
diff --git a/chromium/ui/base/cocoa/three_part_image_unittest.mm b/chromium/ui/base/cocoa/three_part_image_unittest.mm
index efccbefce07..a8a664c5f9d 100644
--- a/chromium/ui/base/cocoa/three_part_image_unittest.mm
+++ b/chromium/ui/base/cocoa/three_part_image_unittest.mm
@@ -4,7 +4,8 @@
 
 #include "ui/base/cocoa/three_part_image.h"
 
-#include "base/memory/scoped_ptr.h"
+#include <memory>
+
 #include "testing/gtest_mac.h"
 #include "ui/base/resource/resource_bundle.h"
 #import "ui/gfx/test/ui_cocoa_test_helper.h"