Rename {absl => std}::optional in //content/
Automated patch, intended to be effectively a no-op.
Context:
https://groups.google.com/a/chromium.org/g/cxx/c/nBD_1LaanTc/m/ghh-ZZhWAwAJ?utm_medium=email&utm_source=footer
As of https://crrev.com/1204351, absl::optional is now a type alias for
std::optional. We should migrate toward it.
Script:
```
function replace {
echo "Replacing $1 by $2"
git grep -l "$1" \
| cut -f1 -d: \
| grep \
-e "^content" \
| sort \
| uniq \
| grep \
-e "\.h" \
-e "\.cc" \
-e "\.mm" \
-e "\.py" \
| xargs sed -i "s/$1/$2/g"
}
replace "absl::make_optional" "std::make_optional"
replace "absl::optional" "std::optional"
replace "absl::nullopt" "std::nullopt"
replace "absl::in_place" "std::in_place"
replace "absl::in_place_t" "std::in_place_t"
replace "\"third_party\/abseil-cpp\/absl\/types\/optional.h\"" "<optional>"
git cl format
```
# Skipping unrelated "check_network_annotation" errors.
NOTRY=True
Bug: chromium:1500249
Change-Id: Icfd31a71d8faf63a2e8d5401127e7ee74cc1c413
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5185537
Auto-Submit: Arthur Sonzogni <[email protected]>
Commit-Queue: Arthur Sonzogni <[email protected]>
Owners-Override: Avi Drissman <[email protected]>
Reviewed-by: Avi Drissman <[email protected]>
Reviewed-by: danakj <[email protected]>
Cr-Commit-Position: refs/heads/main@{#1245739}
diff --git a/content/public/browser/web_contents.h b/content/public/browser/web_contents.h
index 3359bd5..0cdf3f45 100644
--- a/content/public/browser/web_contents.h
+++ b/content/public/browser/web_contents.h
@@ -9,6 +9,7 @@
#include <stdint.h>
#include <memory>
+#include <optional>
#include <string>
#include <vector>
@@ -38,7 +39,6 @@
#include "content/public/browser/visibility.h"
#include "content/public/common/stop_find_action.h"
#include "services/network/public/mojom/web_sandbox_flags.mojom-shared.h"
-#include "third_party/abseil-cpp/absl/types/optional.h"
#include "third_party/blink/public/mojom/favicon/favicon_url.mojom-forward.h"
#include "third_party/blink/public/mojom/frame/find_in_page.mojom-forward.h"
#include "third_party/blink/public/mojom/frame/remote_frame.mojom-forward.h"
@@ -279,7 +279,7 @@
bool enable_wake_locks = true;
// Options specific to WebContents created for picture-in-picture windows.
- absl::optional<blink::mojom::PictureInPictureWindowOptions>
+ std::optional<blink::mojom::PictureInPictureWindowOptions>
picture_in_picture_options;
// WebContentsDelegate given for the case early initialization code depends
@@ -528,11 +528,11 @@
// Returns the theme color for the underlying content as set by the
// theme-color meta tag if any.
- virtual absl::optional<SkColor> GetThemeColor() = 0;
+ virtual std::optional<SkColor> GetThemeColor() = 0;
// Returns the background color for the underlying content as set by CSS if
// any.
- virtual absl::optional<SkColor> GetBackgroundColor() = 0;
+ virtual std::optional<SkColor> GetBackgroundColor() = 0;
// Sets the renderer-side default background color of the page. This is used
// when the page has not loaded enough to know a background color or if the
@@ -545,7 +545,7 @@
// refactor to remove `RenderWidgetHostView::SetBackgroundColor` and merge its
// functionality here, which will be more consistent and simpler to
// understand.
- virtual void SetPageBaseBackgroundColor(absl::optional<SkColor> color) = 0;
+ virtual void SetPageBaseBackgroundColor(std::optional<SkColor> color) = 0;
// Sets the ColorProviderSource for the WebContents. The WebContents will
// maintain an observation of `source` until a new source is set or the
@@ -624,7 +624,7 @@
// |start_recording| is false, it is expected that |callback| does not.
virtual void RecordAccessibilityEvents(
bool start_recording,
- absl::optional<AccessibilityEventCallback> callback) = 0;
+ std::optional<AccessibilityEventCallback> callback) = 0;
// Tab navigation state ------------------------------------------------------
@@ -1316,7 +1316,7 @@
virtual int GetCurrentlyPlayingVideoCount() = 0;
- virtual absl::optional<gfx::Size> GetFullscreenVideoSize() = 0;
+ virtual std::optional<gfx::Size> GetFullscreenVideoSize() = 0;
// Tells the renderer to clear the focused element (if any).
virtual void ClearFocusedElement() = 0;
@@ -1407,7 +1407,7 @@
virtual const base::Location& GetCreatorLocation() = 0;
// Returns the parameters associated with PictureInPicture WebContents
- virtual const absl::optional<blink::mojom::PictureInPictureWindowOptions>&
+ virtual const std::optional<blink::mojom::PictureInPictureWindowOptions>&
GetPictureInPictureOptions() const = 0;
// Hide or show the browser controls for the given WebContents, based on
@@ -1462,10 +1462,10 @@
ui::PageTransition page_transition,
PreloadingHoldbackStatus holdback_status_override,
PreloadingAttempt* preloading_attempt,
- absl::optional<base::RepeatingCallback<bool(const GURL&)>>
- url_match_predicate = absl::nullopt,
- absl::optional<base::RepeatingCallback<void(NavigationHandle&)>>
- prerender_navigation_handle_callback = absl::nullopt) = 0;
+ std::optional<base::RepeatingCallback<bool(const GURL&)>>
+ url_match_predicate = std::nullopt,
+ std::optional<base::RepeatingCallback<void(NavigationHandle&)>>
+ prerender_navigation_handle_callback = std::nullopt) = 0;
// May be called when the embedder believes that it is likely that the user
// will perform a back navigation due to the trigger indicated by `predictor`
@@ -1489,7 +1489,7 @@
// does not need to be exhaustive or perfectly correct.
// TODO(crbug.com/1407197): Remove after bug is fixed.
virtual void SetOwnerLocationForDebug(
- absl::optional<base::Location> owner_location) = 0;
+ std::optional<base::Location> owner_location) = 0;
// Sends the attribution support state to all renderer processes for the
// current page.
