From ec893f8322f2f984ab00cc7b9efbf17cefe77b16 Mon Sep 17 00:00:00 2001 From: John Kleinschmidt Date: Tue, 16 Mar 2021 13:58:27 -0400 Subject: [PATCH] 2757472: Reland "Reland "[LSC] Remove base::string16 alias"" https://chromium-review.googlesource.com/c/chromium/src/+/2757472 --- chromium_src/chrome/browser/certificate_manager_model.h | 1 - shell/browser/browser.h | 1 - shell/browser/extended_web_contents_observer.h | 1 - shell/browser/login_handler.cc | 1 - shell/browser/native_window.h | 1 - shell/browser/native_window_observer.h | 1 - shell/browser/notifications/notification.h | 1 - shell/browser/notifications/win/notification_presenter_win.h | 1 - shell/browser/serial/serial_chooser_controller.h | 1 - shell/browser/ui/cocoa/electron_menu_controller.h | 1 - shell/browser/ui/gtk/gtk_status_icon.h | 1 - shell/browser/ui/inspectable_web_contents_view.h | 1 - shell/browser/ui/message_box.h | 1 - shell/browser/ui/views/global_menu_bar_x11.cc | 1 - shell/common/application_info.h | 1 - shell/common/keyboard_util.h | 1 - shell/common/language_util.h | 2 -- shell/common/platform_util.h | 4 ---- shell/renderer/electron_render_frame_observer.h | 1 - 19 files changed, 23 deletions(-) diff --git a/chromium_src/chrome/browser/certificate_manager_model.h b/chromium_src/chrome/browser/certificate_manager_model.h index 661a524aecd..14517ee8ebc 100644 --- a/chromium_src/chrome/browser/certificate_manager_model.h +++ b/chromium_src/chrome/browser/certificate_manager_model.h @@ -12,7 +12,6 @@ #include "base/callback.h" #include "base/macros.h" #include "base/memory/ref_counted.h" -#include "base/strings/string16.h" #include "net/cert/nss_cert_database.h" namespace content { diff --git a/shell/browser/browser.h b/shell/browser/browser.h index 21ff40453b3..b6d14389988 100755 --- a/shell/browser/browser.h +++ b/shell/browser/browser.h @@ -12,7 +12,6 @@ #include "base/compiler_specific.h" #include "base/macros.h" #include "base/observer_list.h" -#include "base/strings/string16.h" #include "base/task/cancelable_task_tracker.h" #include "base/values.h" #include "gin/dictionary.h" diff --git a/shell/browser/extended_web_contents_observer.h b/shell/browser/extended_web_contents_observer.h index 49b1f30163d..20fd7b45596 100644 --- a/shell/browser/extended_web_contents_observer.h +++ b/shell/browser/extended_web_contents_observer.h @@ -8,7 +8,6 @@ #include #include "base/observer_list.h" -#include "base/strings/string16.h" #include "electron/shell/common/api/api.mojom.h" #include "ui/gfx/geometry/rect.h" diff --git a/shell/browser/login_handler.cc b/shell/browser/login_handler.cc index 1c4cc45a562..e0ac4458ff1 100644 --- a/shell/browser/login_handler.cc +++ b/shell/browser/login_handler.cc @@ -10,7 +10,6 @@ #include #include "base/callback.h" -#include "base/strings/string16.h" #include "base/threading/sequenced_task_runner_handle.h" #include "gin/arguments.h" #include "gin/dictionary.h" diff --git a/shell/browser/native_window.h b/shell/browser/native_window.h index e98801ef003..e48f4d2f3d7 100644 --- a/shell/browser/native_window.h +++ b/shell/browser/native_window.h @@ -15,7 +15,6 @@ #include "base/memory/weak_ptr.h" #include "base/observer_list.h" #include "base/optional.h" -#include "base/strings/string16.h" #include "base/supports_user_data.h" #include "base/values.h" #include "content/public/browser/desktop_media_id.h" diff --git a/shell/browser/native_window_observer.h b/shell/browser/native_window_observer.h index 32276cbdacf..4d81276b5fb 100644 --- a/shell/browser/native_window_observer.h +++ b/shell/browser/native_window_observer.h @@ -8,7 +8,6 @@ #include #include "base/observer_list_types.h" -#include "base/strings/string16.h" #include "base/values.h" #include "ui/base/window_open_disposition.h" #include "url/gurl.h" diff --git a/shell/browser/notifications/notification.h b/shell/browser/notifications/notification.h index 4edcc7b93fb..927d9424ebf 100644 --- a/shell/browser/notifications/notification.h +++ b/shell/browser/notifications/notification.h @@ -9,7 +9,6 @@ #include #include "base/memory/weak_ptr.h" -#include "base/strings/string16.h" #include "third_party/skia/include/core/SkBitmap.h" #include "url/gurl.h" diff --git a/shell/browser/notifications/win/notification_presenter_win.h b/shell/browser/notifications/win/notification_presenter_win.h index 7e739ce9be0..58d9cc38197 100644 --- a/shell/browser/notifications/win/notification_presenter_win.h +++ b/shell/browser/notifications/win/notification_presenter_win.h @@ -24,7 +24,6 @@ #define SHELL_BROWSER_NOTIFICATIONS_WIN_NOTIFICATION_PRESENTER_WIN_H_ #include "base/files/scoped_temp_dir.h" -#include "base/strings/string16.h" #include "shell/browser/notifications/notification_presenter.h" class GURL; diff --git a/shell/browser/serial/serial_chooser_controller.h b/shell/browser/serial/serial_chooser_controller.h index 40bff12b7f8..85c37590825 100644 --- a/shell/browser/serial/serial_chooser_controller.h +++ b/shell/browser/serial/serial_chooser_controller.h @@ -10,7 +10,6 @@ #include "base/macros.h" #include "base/memory/weak_ptr.h" -#include "base/strings/string16.h" #include "content/public/browser/serial_chooser.h" #include "content/public/browser/web_contents.h" #include "content/public/browser/web_contents_observer.h" diff --git a/shell/browser/ui/cocoa/electron_menu_controller.h b/shell/browser/ui/cocoa/electron_menu_controller.h index af080b1071e..42f987b3fa2 100644 --- a/shell/browser/ui/cocoa/electron_menu_controller.h +++ b/shell/browser/ui/cocoa/electron_menu_controller.h @@ -11,7 +11,6 @@ #include "base/callback.h" #include "base/mac/scoped_nsobject.h" #include "base/memory/weak_ptr.h" -#include "base/strings/string16.h" namespace electron { class ElectronMenuModel; diff --git a/shell/browser/ui/gtk/gtk_status_icon.h b/shell/browser/ui/gtk/gtk_status_icon.h index fe145450550..eee9a21af40 100644 --- a/shell/browser/ui/gtk/gtk_status_icon.h +++ b/shell/browser/ui/gtk/gtk_status_icon.h @@ -8,7 +8,6 @@ #include #include "base/macros.h" -#include "base/strings/string16.h" #include "ui/base/glib/glib_integers.h" #include "ui/base/glib/glib_signal.h" #include "ui/views/linux_ui/status_icon_linux.h" diff --git a/shell/browser/ui/inspectable_web_contents_view.h b/shell/browser/ui/inspectable_web_contents_view.h index 233a1276f25..1827787a519 100644 --- a/shell/browser/ui/inspectable_web_contents_view.h +++ b/shell/browser/ui/inspectable_web_contents_view.h @@ -6,7 +6,6 @@ #ifndef SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_H_ #define SHELL_BROWSER_UI_INSPECTABLE_WEB_CONTENTS_VIEW_H_ -#include "base/strings/string16.h" #include "ui/gfx/native_widget_types.h" class DevToolsContentsResizingStrategy; diff --git a/shell/browser/ui/message_box.h b/shell/browser/ui/message_box.h index 9126b994073..9cc2d716f54 100644 --- a/shell/browser/ui/message_box.h +++ b/shell/browser/ui/message_box.h @@ -10,7 +10,6 @@ #include #include "base/callback_forward.h" -#include "base/strings/string16.h" #include "ui/gfx/image/image_skia.h" namespace electron { diff --git a/shell/browser/ui/views/global_menu_bar_x11.cc b/shell/browser/ui/views/global_menu_bar_x11.cc index 387cc1b0f6e..63cdffcf4e9 100644 --- a/shell/browser/ui/views/global_menu_bar_x11.cc +++ b/shell/browser/ui/views/global_menu_bar_x11.cc @@ -8,7 +8,6 @@ #include #include "base/logging.h" -#include "base/strings/string16.h" #include "base/strings/stringprintf.h" #include "base/strings/utf_string_conversions.h" #include "chrome/browser/ui/views/frame/global_menu_bar_registrar_x11.h" diff --git a/shell/common/application_info.h b/shell/common/application_info.h index 63062c09f84..fcabc81f965 100644 --- a/shell/common/application_info.h +++ b/shell/common/application_info.h @@ -6,7 +6,6 @@ #define SHELL_COMMON_APPLICATION_INFO_H_ #if defined(OS_WIN) -#include "base/strings/string16.h" #include "shell/browser/win/scoped_hstring.h" #endif diff --git a/shell/common/keyboard_util.h b/shell/common/keyboard_util.h index 127c7bea190..28f2a69637a 100644 --- a/shell/common/keyboard_util.h +++ b/shell/common/keyboard_util.h @@ -7,7 +7,6 @@ #include -#include "base/strings/string16.h" #include "ui/events/keycodes/keyboard_codes.h" namespace electron { diff --git a/shell/common/language_util.h b/shell/common/language_util.h index fcb61fe4a48..6f15cc68022 100644 --- a/shell/common/language_util.h +++ b/shell/common/language_util.h @@ -8,8 +8,6 @@ #include #include -#include "base/strings/string16.h" - namespace electron { // Return a list of user preferred languages from OS. The list doesn't include diff --git a/shell/common/platform_util.h b/shell/common/platform_util.h index 541660003b4..b9e801f055a 100644 --- a/shell/common/platform_util.h +++ b/shell/common/platform_util.h @@ -11,10 +11,6 @@ #include "base/files/file_path.h" #include "build/build_config.h" -#if defined(OS_WIN) -#include "base/strings/string16.h" -#endif - class GURL; namespace platform_util { diff --git a/shell/renderer/electron_render_frame_observer.h b/shell/renderer/electron_render_frame_observer.h index eb59ae0cd44..03f0b82397d 100644 --- a/shell/renderer/electron_render_frame_observer.h +++ b/shell/renderer/electron_render_frame_observer.h @@ -7,7 +7,6 @@ #include -#include "base/strings/string16.h" #include "content/public/renderer/render_frame_observer.h" #include "ipc/ipc_platform_file.h" #include "shell/renderer/renderer_client_base.h"