BASELINE: Update Chromium to 49.0.2623.23

Also adds missing printing sources.

Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>

1 files changed, 13 insertions, 11 deletions

diff --git a/chromium/content/child/webthemeengine_impl_default.h b/chromium/content/child/webthemeengine_impl_default.h
index a05313aad98..c927e5a6099 100644
--- a/chromium/content/child/webthemeengine_impl_default.h
+++ b/chromium/content/child/webthemeengine_impl_default.h
@@ -5,6 +5,9 @@
 #ifndef CONTENT_CHILD_WEBTHEMEENGINE_IMPL_DEFAULT_H_
 #define CONTENT_CHILD_WEBTHEMEENGINE_IMPL_DEFAULT_H_
 
+#include <stdint.h>
+
+#include "build/build_config.h"
 #include "third_party/WebKit/public/platform/WebThemeEngine.h"
 
 namespace content {
@@ -12,13 +15,12 @@ namespace content {
 class WebThemeEngineImpl : public blink::WebThemeEngine {
  public:
   // WebThemeEngine methods:
-  virtual blink::WebSize getSize(blink::WebThemeEngine::Part);
-  virtual void paint(
-      blink::WebCanvas* canvas,
-      blink::WebThemeEngine::Part part,
-      blink::WebThemeEngine::State state,
-      const blink::WebRect& rect,
-      const blink::WebThemeEngine::ExtraParams* extra_params);
+  blink::WebSize getSize(blink::WebThemeEngine::Part) override;
+  void paint(blink::WebCanvas* canvas,
+             blink::WebThemeEngine::Part part,
+             blink::WebThemeEngine::State state,
+             const blink::WebRect& rect,
+             const blink::WebThemeEngine::ExtraParams* extra_params) override;
   virtual void paintStateTransition(blink::WebCanvas* canvas,
                                     blink::WebThemeEngine::Part part,
                                     blink::WebThemeEngine::State startState,
@@ -28,10 +30,10 @@ class WebThemeEngineImpl : public blink::WebThemeEngine {
 
 #if defined(OS_WIN)
   // Caches the scrollbar metrics.
-  static void cacheScrollBarMetrics(int32 vertical_scroll_bar_width,
-                                    int32 horizontal_scroll_bar_height,
-                                    int32 vertical_arrow_bitmap_height,
-                                    int32 horizontal_arrow_bitmap_width);
+  static void cacheScrollBarMetrics(int32_t vertical_scroll_bar_width,
+                                    int32_t horizontal_scroll_bar_height,
+                                    int32_t vertical_arrow_bitmap_height,
+                                    int32_t horizontal_arrow_bitmap_width);
 #endif
 };