Commit 1a4dd5e0 authored by tzik's avatar tzik Committed by Commit Bot

Make base::Optional replaceable with std::optional

This CL contains IWYU fixes and an ADL elimination in order to
maintain base::Optional replaceable with std::optional.

color_helpers.cc and navigation_url_loader.h used to depend on the
indirect include directives around base/optional.h, that will be
unavailable on the C++17 mode build.

In render_widget_unittest.cc, a base::Bind name is pulled by
base::Optional on the parameter type of HandleCallback, which will be
unavailable after base::Optional is replaced with std::optional.

Tbr: dtrainor@chromium.org
Change-Id: I132b02da61484f72020e9f7fb5b12c8a21a22d37
Reviewed-on: https://chromium-review.googlesource.com/c/1280063
Commit-Queue: Taiju Tsuiki <tzik@chromium.org>
Reviewed-by: default avatarKinuko Yasuda <kinuko@chromium.org>
Cr-Commit-Position: refs/heads/master@{#599577}
parent 46d3733e
......@@ -4,6 +4,7 @@
#include "chrome/browser/android/color_helpers.h"
#include "base/logging.h"
#include "base/numerics/safe_math.h"
#include "ui/gfx/color_utils.h"
......
......@@ -6,6 +6,8 @@
#define CONTENT_BROWSER_LOADER_NAVIGATION_URL_LOADER_H_
#include <memory>
#include <string>
#include <vector>
#include "base/macros.h"
#include "base/optional.h"
......
......@@ -114,8 +114,8 @@ class MockHandledEventCallback {
base::Optional<cc::TouchAction>));
HandledEventCallback GetCallback() {
return BindOnce(&MockHandledEventCallback::HandleCallback,
base::Unretained(this));
return base::BindOnce(&MockHandledEventCallback::HandleCallback,
base::Unretained(this));
}
private:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment