Update chromium to branch 1599.

Change-Id: I04e775a946a208bb4500d3b722bcb05c82b9d7cb
Reviewed-by: Andras Becsi <andras.becsi@digia.com>

28 files changed, 4 insertions, 21 deletions

diff --git a/chromium/ui/resources/default_100_percent/common/drag_tip_copy.png b/chromium/ui/resources/default_100_percent/common/drag_tip_copy.png
deleted file mode 100644
index f642042a887..00000000000
--- a/chromium/ui/resources/default_100_percent/common/drag_tip_copy.png
+++ /dev/null
diff --git a/chromium/ui/resources/default_100_percent/common/drag_tip_link.png b/chromium/ui/resources/default_100_percent/common/drag_tip_link.png
deleted file mode 100644
index 8f61a39dd20..00000000000
--- a/chromium/ui/resources/default_100_percent/common/drag_tip_link.png
+++ /dev/null
diff --git a/chromium/ui/resources/default_100_percent/common/drag_tip_move.png b/chromium/ui/resources/default_100_percent/common/drag_tip_move.png
deleted file mode 100644
index a897ef4799a..00000000000
--- a/chromium/ui/resources/default_100_percent/common/drag_tip_move.png
+++ /dev/null
diff --git a/chromium/ui/resources/default_100_percent/common/drag_tip_nodrop.png b/chromium/ui/resources/default_100_percent/common/drag_tip_nodrop.png
deleted file mode 100644
index 0ee96bf3e46..00000000000
--- a/chromium/ui/resources/default_100_percent/common/drag_tip_nodrop.png
+++ /dev/null
diff --git a/chromium/ui/resources/default_100_percent/common/notification_clear_all_disabled.png b/chromium/ui/resources/default_100_percent/common/notification_clear_all_disabled.png
new file mode 100644
index 00000000000..a15a261e027
--- /dev/null
+++ b/chromium/ui/resources/default_100_percent/common/notification_clear_all_disabled.png
diff --git a/chromium/ui/resources/default_100_percent/mac/notification_tray_attention.png b/chromium/ui/resources/default_100_percent/mac/notification_tray_attention.png
index f6fe8298b61..6e4910943cb 100644
--- a/chromium/ui/resources/default_100_percent/mac/notification_tray_attention.png
+++ b/chromium/ui/resources/default_100_percent/mac/notification_tray_attention.png
diff --git a/chromium/ui/resources/default_100_percent/mac/notification_tray_attention_pressed.png b/chromium/ui/resources/default_100_percent/mac/notification_tray_attention_pressed.png
index e4f8cdb5dd9..931a4abcaf2 100644
--- a/chromium/ui/resources/default_100_percent/mac/notification_tray_attention_pressed.png
+++ b/chromium/ui/resources/default_100_percent/mac/notification_tray_attention_pressed.png
diff --git a/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_attention.png b/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_attention.png
index 042673f535c..335a302712c 100644
--- a/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_attention.png
+++ b/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_attention.png
diff --git a/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_attention_pressed.png b/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_attention_pressed.png
index 324e373cda1..7ab9ee0b751 100644
--- a/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_attention_pressed.png
+++ b/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_attention_pressed.png
diff --git a/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_empty.png b/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_empty.png
index 57474d5acc9..3c9149e6f12 100644
--- a/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_empty.png
+++ b/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_empty.png
diff --git a/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_empty_pressed.png b/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_empty_pressed.png
index bd40cfdfa23..87acf99e3d5 100644
--- a/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_empty_pressed.png
+++ b/chromium/ui/resources/default_100_percent/mac/notification_tray_do_not_disturb_empty_pressed.png
diff --git a/chromium/ui/resources/default_100_percent/mac/notification_tray_empty.png b/chromium/ui/resources/default_100_percent/mac/notification_tray_empty.png
index 7a929986074..db17be92556 100644
--- a/chromium/ui/resources/default_100_percent/mac/notification_tray_empty.png
+++ b/chromium/ui/resources/default_100_percent/mac/notification_tray_empty.png
diff --git a/chromium/ui/resources/default_100_percent/mac/notification_tray_empty_pressed.png b/chromium/ui/resources/default_100_percent/mac/notification_tray_empty_pressed.png
index 15d30bf68f6..2f3d8fca7c1 100644
--- a/chromium/ui/resources/default_100_percent/mac/notification_tray_empty_pressed.png
+++ b/chromium/ui/resources/default_100_percent/mac/notification_tray_empty_pressed.png
diff --git a/chromium/ui/resources/default_200_percent/common/drag_tip_copy.png b/chromium/ui/resources/default_200_percent/common/drag_tip_copy.png
deleted file mode 100644
index 53dafb5d24d..00000000000
--- a/chromium/ui/resources/default_200_percent/common/drag_tip_copy.png
+++ /dev/null
diff --git a/chromium/ui/resources/default_200_percent/common/drag_tip_link.png b/chromium/ui/resources/default_200_percent/common/drag_tip_link.png
deleted file mode 100644
index fe0fd25d144..00000000000
--- a/chromium/ui/resources/default_200_percent/common/drag_tip_link.png
+++ /dev/null
diff --git a/chromium/ui/resources/default_200_percent/common/drag_tip_move.png b/chromium/ui/resources/default_200_percent/common/drag_tip_move.png
deleted file mode 100644
index e2374ece106..00000000000
--- a/chromium/ui/resources/default_200_percent/common/drag_tip_move.png
+++ /dev/null
diff --git a/chromium/ui/resources/default_200_percent/common/drag_tip_nodrop.png b/chromium/ui/resources/default_200_percent/common/drag_tip_nodrop.png
deleted file mode 100644
index f96948fd39b..00000000000
--- a/chromium/ui/resources/default_200_percent/common/drag_tip_nodrop.png
+++ /dev/null
diff --git a/chromium/ui/resources/default_200_percent/common/notification_clear_all_disabled.png b/chromium/ui/resources/default_200_percent/common/notification_clear_all_disabled.png
new file mode 100644
index 00000000000..30578aaee20
--- /dev/null
+++ b/chromium/ui/resources/default_200_percent/common/notification_clear_all_disabled.png
diff --git a/chromium/ui/resources/default_200_percent/mac/notification_tray_attention.png b/chromium/ui/resources/default_200_percent/mac/notification_tray_attention.png
index c0b374bd17a..6587f34bb8e 100644
--- a/chromium/ui/resources/default_200_percent/mac/notification_tray_attention.png
+++ b/chromium/ui/resources/default_200_percent/mac/notification_tray_attention.png
diff --git a/chromium/ui/resources/default_200_percent/mac/notification_tray_attention_pressed.png b/chromium/ui/resources/default_200_percent/mac/notification_tray_attention_pressed.png
index 43c496ff8cb..7d2521c790b 100644
--- a/chromium/ui/resources/default_200_percent/mac/notification_tray_attention_pressed.png
+++ b/chromium/ui/resources/default_200_percent/mac/notification_tray_attention_pressed.png
diff --git a/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_attention.png b/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_attention.png
index 27dc58ad12c..f0584e43351 100644
--- a/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_attention.png
+++ b/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_attention.png
diff --git a/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_attention_pressed.png b/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_attention_pressed.png
index e8e1e2454e9..8f922347de3 100644
--- a/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_attention_pressed.png
+++ b/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_attention_pressed.png
diff --git a/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_empty.png b/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_empty.png
index b0b799a2773..2370e7acdec 100644
--- a/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_empty.png
+++ b/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_empty.png
diff --git a/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_empty_pressed.png b/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_empty_pressed.png
index 74e09582063..1c6a7af60e7 100644
--- a/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_empty_pressed.png
+++ b/chromium/ui/resources/default_200_percent/mac/notification_tray_do_not_disturb_empty_pressed.png
diff --git a/chromium/ui/resources/default_200_percent/mac/notification_tray_empty.png b/chromium/ui/resources/default_200_percent/mac/notification_tray_empty.png
index 32f817e2087..e3fc1f3bfbe 100644
--- a/chromium/ui/resources/default_200_percent/mac/notification_tray_empty.png
+++ b/chromium/ui/resources/default_200_percent/mac/notification_tray_empty.png
diff --git a/chromium/ui/resources/default_200_percent/mac/notification_tray_empty_pressed.png b/chromium/ui/resources/default_200_percent/mac/notification_tray_empty_pressed.png
index e44934c02ad..21492e85dcf 100644
--- a/chromium/ui/resources/default_200_percent/mac/notification_tray_empty_pressed.png
+++ b/chromium/ui/resources/default_200_percent/mac/notification_tray_empty_pressed.png
diff --git a/chromium/ui/resources/resource_check/resource_scale_factors.py b/chromium/ui/resources/resource_check/resource_scale_factors.py
index 9ddc70fda60..f974447ccf2 100644
--- a/chromium/ui/resources/resource_check/resource_scale_factors.py
+++ b/chromium/ui/resources/resource_check/resource_scale_factors.py
@@ -15,10 +15,6 @@ import os
 import struct
 
 
-class InvalidPNGException(Exception):
-  pass
-
-
 class ResourceScaleFactors(object):
   """Verifier of image dimensions for Chromium resources.
 
@@ -48,8 +44,7 @@ class ResourceScaleFactors(object):
     def ImageSize(filename):
       with open(filename, 'rb', buffering=0) as f:
         data = f.read(24)
-      if data[:8] != '\x89PNG\r\n\x1A\n' or data[12:16] != 'IHDR':
-        raise InvalidPNGException
+      assert data[:8] == '\x89PNG\r\n\x1A\n' and data[12:16] == 'IHDR'
       return struct.unpack('>ii', data[16:24])
 
     # Returns a list of valid scaled image sizes. The valid sizes are the
@@ -80,9 +75,6 @@ class ResourceScaleFactors(object):
           if relative_path not in files:
             files.append(relative_path)
 
-    corrupt_png_error = ('Corrupt PNG in file %s. Note that binaries are not '
-        'correctly uploaded to the code review tool and must be directly '
-        'submitted using the dcommit command.')
     for f in files:
       base_image = self.input_api.os_path.join(self.paths[0][1], f)
       if not os.path.exists(base_image):
@@ -90,12 +82,7 @@ class ResourceScaleFactors(object):
             'Base image %s does not exist' % self.input_api.os_path.join(
             repository_path, base_image)))
         continue
-      try:
-        base_dimensions = ImageSize(base_image)
-      except InvalidPNGException:
-        results.append(self.output_api.PresubmitError(corrupt_png_error %
-            self.input_api.os_path.join(repository_path, base_image)))
-        continue
+      base_dimensions = ImageSize(base_image)
       # Find all scaled versions of the base image and verify their sizes.
       for i in range(1, len(self.paths)):
         image_path = self.input_api.os_path.join(self.paths[i][1], f)
@@ -103,12 +90,7 @@ class ResourceScaleFactors(object):
           continue
         # Ensure that each image for a particular scale factor is the
         # correct scale of the base image.
-        try:
-          scaled_dimensions = ImageSize(image_path)
-        except InvalidPNGException:
-          results.append(self.output_api.PresubmitError(corrupt_png_error %
-              self.input_api.os_path.join(repository_path, image_path)))
-          continue
+        scaled_dimensions = ImageSize(image_path)
         for dimension_name, base_size, scaled_size in zip(
             ('width', 'height'), base_dimensions, scaled_dimensions):
           valid_sizes = ValidSizes(base_size, self.paths[i][0])
diff --git a/chromium/ui/resources/ui_resources.grd b/chromium/ui/resources/ui_resources.grd
index 1aeb4d1ed98..067e2eaa925 100644
--- a/chromium/ui/resources/ui_resources.grd
+++ b/chromium/ui/resources/ui_resources.grd
@@ -240,6 +240,7 @@
       <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ARROW_HOVER" file="common/notification_arrow_hover.png"/>
       <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_ARROW_PRESSED" file="common/notification_arrow_pressed.png"/>
       <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL" file="common/notification_clear_all.png"/>
+      <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL_DISABLED" file="common/notification_clear_all_disabled.png"/>
       <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL_HOVER" file="common/notification_clear_all_hover.png"/>
       <structure type="chrome_scaled_image" name="IDR_NOTIFICATION_CLEAR_ALL_PRESSED" file="common/notification_clear_all_pressed.png"/>
       <if expr="is_win">