Skip to content

Commit 5bc3326

Browse files
ArthurSonzogniChromium LUCI CQ
authored andcommitted
Cleanup: Format <optional> include order.
This is an automated patch. Please avoid assigning unrelated bug. #cleanup This is a follow-up to @thestig comment: https://chromium-review.googlesource.com/c/chromium/src/+/5009410/7/pdf/accessibility_helper.cc#11 Several developers, including myself rewrote optional without properly reordering the #includes at the beginning. This patches automatically fixes it. Script: ------- ``` function replace { echo "Replacing $1 by $2" git grep -l "$1" \ | cut -f1 -d: \ | grep -v \ -e "*win*" \ -e "third_party/*" \ -e "tools/*" \ | grep \ -e "\.h" \ -e "\.cc" \ | sort \ | uniq \ | xargs sed -i "s/$1/$2/g" } replace "#include <optional>" "" git add -u git commit -m "remove optional" git revert HEAD --no-commit git add -u echo "Formatting": echo "IncludeBlocks: Regroup" >> ".clang-format" echo "IncludeIsMainRegex: \"(_(android|apple|chromeos|freebsd|fuchsia|fuzzer|ios|linux|mac|nacl|openbsd|posix|stubs?|win))?(_(unit|browser|perf)?tests?)?$\"" >> ".clang-format" git add -u git cl format --upstream=HEAD git checkout origin/main -- ".clang-format" git add -u git commit -m "revert with format" git reset --soft origin/main git add -u git commit -m "Automated format" ``` cleanup: This is a no-op patch formatting includes. Bug: 40288126 Change-Id: I5f61b1207c097a4c6b20a034f9d1b323975b1851 AX-Relnotes: n/a. Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5335142 Owners-Override: Lei Zhang <[email protected]> Reviewed-by: Lei Zhang <[email protected]> Commit-Queue: Arthur Sonzogni <[email protected]> Cr-Commit-Position: refs/heads/main@{#1267143}
1 parent 104e3c2 commit 5bc3326

File tree

642 files changed

+750
-449
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

642 files changed

+750
-449
lines changed

android_webview/browser/aw_contents_io_thread_client.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66

77
#include <map>
88
#include <memory>
9+
#include <optional>
910
#include <utility>
1011

11-
#include <optional>
1212
#include "android_webview/browser/aw_settings.h"
1313
#include "android_webview/browser/network_service/aw_web_resource_intercept_response.h"
1414
#include "android_webview/browser/network_service/aw_web_resource_request.h"

android_webview/browser/aw_http_auth_handler.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@
44

55
#include "android_webview/browser/aw_http_auth_handler.h"
66

7+
#include <optional>
78
#include <utility>
89

9-
#include <optional>
1010
#include "android_webview/browser/aw_contents.h"
1111
#include "android_webview/browser_jni_headers/AwHttpAuthHandler_jni.h"
1212
#include "base/android/jni_android.h"

android_webview/browser/cookie_manager.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,10 @@
77
#include <stdint.h>
88

99
#include <memory>
10+
#include <optional>
1011
#include <utility>
1112
#include <vector>
1213

13-
#include <optional>
1414
#include "android_webview/browser/aw_browser_context.h"
1515
#include "android_webview/browser/aw_browser_context_store.h"
1616
#include "android_webview/browser/aw_client_hints_controller_delegate.h"

android_webview/browser/gfx/aw_draw_fn_impl.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define ANDROID_WEBVIEW_BROWSER_GFX_AW_DRAW_FN_IMPL_H_
77

88
#include <optional>
9+
910
#include "android_webview/browser/gfx/aw_vulkan_context_provider.h"
1011
#include "android_webview/browser/gfx/compositor_frame_consumer.h"
1112
#include "android_webview/browser/gfx/render_thread_manager.h"

android_webview/browser/gfx/aw_vulkan_context_provider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
#define ANDROID_WEBVIEW_BROWSER_GFX_AW_VULKAN_CONTEXT_PROVIDER_H_
77

88
#include <memory>
9-
109
#include <optional>
10+
1111
#include "base/memory/raw_ptr.h"
1212
#include "components/viz/common/gpu/vulkan_context_provider.h"
1313
#include "gpu/vulkan/vulkan_device_queue.h"

android_webview/browser/gfx/browser_view_renderer.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@
88
#include <stddef.h>
99

1010
#include <map>
11+
#include <optional>
1112
#include <set>
1213

13-
#include <optional>
1414
#include "android_webview/browser/gfx/begin_frame_source_webview.h"
1515
#include "android_webview/browser/gfx/child_frame.h"
1616
#include "android_webview/browser/gfx/compositor_frame_producer.h"

android_webview/browser/gfx/child_frame.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
#define ANDROID_WEBVIEW_BROWSER_GFX_CHILD_FRAME_H_
77

88
#include <memory>
9+
#include <optional>
910
#include <vector>
1011

11-
#include <optional>
1212
#include "base/containers/circular_deque.h"
1313
#include "components/viz/common/frame_sinks/begin_frame_args.h"
1414
#include "components/viz/common/surfaces/frame_sink_id.h"

android_webview/browser/gfx/render_thread_manager.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@
55
#include "android_webview/browser/gfx/render_thread_manager.h"
66

77
#include <memory>
8+
#include <optional>
89
#include <utility>
910

10-
#include <optional>
1111
#include "android_webview/browser/gfx/compositor_frame_producer.h"
1212
#include "android_webview/browser/gfx/gpu_service_webview.h"
1313
#include "android_webview/browser/gfx/hardware_renderer.h"

android_webview/browser/network_service/aw_proxying_url_loader_factory.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
#include "android_webview/browser/network_service/aw_proxying_url_loader_factory.h"
66

77
#include <memory>
8+
#include <optional>
89
#include <string>
910
#include <utility>
1011
#include <vector>
1112

12-
#include <optional>
1313
#include "android_webview/browser/android_protocol_handler.h"
1414
#include "android_webview/browser/aw_browser_context.h"
1515
#include "android_webview/browser/aw_contents_client_bridge.h"

android_webview/browser/network_service/aw_proxying_url_loader_factory.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
#define ANDROID_WEBVIEW_BROWSER_NETWORK_SERVICE_AW_PROXYING_URL_LOADER_FACTORY_H_
77

88
#include <optional>
9+
910
#include "android_webview/browser/network_service/aw_browser_context_io_thread_handle.h"
1011
#include "base/memory/weak_ptr.h"
1112
#include "components/embedder_support/android/util/android_stream_reader_url_loader.h"

0 commit comments

Comments
 (0)