BASELINE: Update Chromium to 58.0.3029.54

Change-Id: I67f57065a7afdc8e4614adb5c0230281428df4d1
Reviewed-by: Peter Varga <pvarga@inf.u-szeged.hu>

8 files changed, 49 insertions, 29 deletions

diff --git a/chromium/ash/public/cpp/BUILD.gn b/chromium/ash/public/cpp/BUILD.gn
index 521d9fbbf9f..e9d52163fb4 100644
--- a/chromium/ash/public/cpp/BUILD.gn
+++ b/chromium/ash/public/cpp/BUILD.gn
@@ -3,15 +3,34 @@
 # found in the LICENSE file.
 
 # C++ headers and sources that can be used outside ash.
-source_set("cpp") {
+component("ash_public_cpp") {
   sources = [
+    "ash_public_export.h",
+    "mus_property_mirror_ash.cc",
+    "mus_property_mirror_ash.h",
     "session_types.h",
+    "shelf_application_menu_item.cc",
+    "shelf_application_menu_item.h",
+    "shelf_types.cc",
     "shelf_types.h",
     "shell_window_ids.cc",
     "shell_window_ids.h",
+    "window_properties.cc",
+    "window_properties.h",
   ]
 
+  defines = [ "ASH_PUBLIC_IMPLEMENTATION" ]
+
   deps = [
     "//base",
+    "//ui/aura",
+    "//ui/views/mus",
+  ]
+
+  public_deps = [
+    "//ash/public/interfaces:interfaces_internal",
   ]
+
+  allow_circular_includes_from =
+      [ "//ash/public/interfaces:interfaces_internal" ]
 }
diff --git a/chromium/ash/public/interfaces/BUILD.gn b/chromium/ash/public/interfaces/BUILD.gn
index 69c170faba9..3657070603f 100644
--- a/chromium/ash/public/interfaces/BUILD.gn
+++ b/chromium/ash/public/interfaces/BUILD.gn
@@ -4,11 +4,17 @@
 
 import("//mojo/public/tools/bindings/mojom.gni")
 
-mojom("interfaces") {
+# Depend upon //ash/public/cpp:ash_public_cpp, which has a public_dep on this.
+# The two targets must be bundled together as the typemaps depend upon
+# //ash/public/cpp, and //ash/public/cpp needs to depend on this for generated
+# code (such as enums and constants).
+mojom("interfaces_internal") {
+  visibility = [ "//ash/public/cpp:ash_public_cpp" ]
+
   sources = [
     "accelerator_controller.mojom",
-    "ash_window_type.mojom",
     "cast_config.mojom",
+    "constants.mojom",
     "locale.mojom",
     "media.mojom",
     "new_window.mojom",
@@ -27,4 +33,8 @@ mojom("interfaces") {
     "//components/signin/public/interfaces",
     "//skia/public/interfaces",
   ]
+
+  export_class_attribute = "ASH_PUBLIC_EXPORT"
+  export_define = "ASH_PUBLIC_IMPLEMENTATION=1"
+  export_header = "ash/public/cpp/ash_public_export.h"
 }
diff --git a/chromium/ash/public/interfaces/ash_window_type.mojom b/chromium/ash/public/interfaces/ash_window_type.mojom
deleted file mode 100644
index 61f2c4d6435..00000000000
--- a/chromium/ash/public/interfaces/ash_window_type.mojom
+++ /dev/null
@@ -1,13 +0,0 @@
-// Copyright 2016 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-module ash.mojom;
-
-enum AshWindowType {
-  SHELF = 0,
-  STATUS_AREA,
-  COUNT
-};
-
-const string kAshWindowType_Property = "ash:window-type";
diff --git a/chromium/ash/public/interfaces/constants.mojom b/chromium/ash/public/interfaces/constants.mojom
new file mode 100644
index 00000000000..60c2a21ea15
--- /dev/null
+++ b/chromium/ash/public/interfaces/constants.mojom
@@ -0,0 +1,7 @@
+// Copyright 2017 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+module ash.mojom;
+
+const string kServiceName = "ash";
diff --git a/chromium/ash/public/interfaces/session_controller.mojom b/chromium/ash/public/interfaces/session_controller.mojom
index 7aa76f4f231..9531590e0a1 100644
--- a/chromium/ash/public/interfaces/session_controller.mojom
+++ b/chromium/ash/public/interfaces/session_controller.mojom
@@ -65,6 +65,12 @@ enum UserType {
   ACTIVE_DIRECTORY,
 };
 
+// Matches ash::CycleUserDirection.
+enum CycleUserDirection {
+  NEXT,  // Cycle to the next user.
+  PREVIOUS,  // Cycle to the previous user.
+};
+
 // Info about a user session in ash.
 struct UserSession {
   // A user session id for the user session. It is generated by session manager
@@ -97,9 +103,6 @@ enum AddUserSessionPolicy {
 
 // Info about an ash session.
 struct SessionInfo {
-  // Maximum possible number of logged in users in ash.
-  uint32 max_users;
-
   // Whether the screen can be locked.
   bool can_lock_screen;
 
@@ -143,5 +146,5 @@ interface SessionControllerClient {
   SwitchActiveUser(signin.mojom.AccountId account_id);
 
   // Switch the active user to the next or previous user.
-  CycleActiveUser(bool next_user);
+  CycleActiveUser(CycleUserDirection direction);
 };
diff --git a/chromium/ash/public/interfaces/session_controller.typemap b/chromium/ash/public/interfaces/session_controller.typemap
index c0179ce69fa..67592a272f2 100644
--- a/chromium/ash/public/interfaces/session_controller.typemap
+++ b/chromium/ash/public/interfaces/session_controller.typemap
@@ -10,12 +10,12 @@ public_headers = [
 ]
 traits_headers = [ "//ash/public/interfaces/session_controller_traits.h" ]
 public_deps = [
-  "//ash/public/cpp",
   "//components/session_manager:base",
   "//components/user_manager",
 ]
 type_mappings = [
   "ash.mojom.AddUserSessionPolicy=ash::AddUserSessionPolicy",
+  "ash.mojom.CycleUserDirection=ash::CycleUserDirection",
   "ash.mojom.SessionState=session_manager::SessionState",
   "ash.mojom.UserType=user_manager::UserType",
 ]
diff --git a/chromium/ash/public/interfaces/shelf.typemap b/chromium/ash/public/interfaces/shelf.typemap
index 5fd20642dc7..1af3425ee77 100644
--- a/chromium/ash/public/interfaces/shelf.typemap
+++ b/chromium/ash/public/interfaces/shelf.typemap
@@ -4,10 +4,7 @@
 
 mojom = "//ash/public/interfaces/shelf.mojom"
 public_headers = [ "//ash/public/cpp/shelf_types.h" ]
-traits_headers = [ "//ash/public/interfaces/shelf_enum_traits.h" ]
-public_deps = [
-  "//ash/public/cpp",
-]
+traits_headers = [ "//ash/public/interfaces/shelf_struct_traits.h" ]
 type_mappings = [
   "ash.mojom.ShelfAlignment=ash::ShelfAlignment",
   "ash.mojom.ShelfAutoHideBehavior=ash::ShelfAutoHideBehavior",
diff --git a/chromium/ash/public/interfaces/wallpaper.typemap b/chromium/ash/public/interfaces/wallpaper.typemap
index a8612da74e9..6b83004e5fe 100644
--- a/chromium/ash/public/interfaces/wallpaper.typemap
+++ b/chromium/ash/public/interfaces/wallpaper.typemap
@@ -4,8 +4,5 @@
 
 mojom = "//ash/public/interfaces/wallpaper.mojom"
 public_headers = [ "//components/wallpaper/wallpaper_layout.h" ]
-traits_headers = [ "//ash/public/interfaces/wallpaper_enum_traits.h" ]
-public_deps = [
-  "//ash/public/cpp",
-]
+traits_headers = [ "//ash/public/interfaces/wallpaper_struct_traits.h" ]
 type_mappings = [ "ash.mojom.WallpaperLayout=wallpaper::WallpaperLayout" ]