Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit d883683

Browse files
authored
Fix header-guard naming convention in shell/. (#49006)
Part of landing #48903. Some of these actually seem like potential owchy spots, i.e. `#ifndef FLUTTER_FLUTTER_H_`.
1 parent 8517ab3 commit d883683

File tree

204 files changed

+605
-575
lines changed

Some content is hidden

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

204 files changed

+605
-575
lines changed

shell/common/dl_op_spy.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef FLUTTER_DISPLAY_LIST_DL_OP_SPY_H_
6-
#define FLUTTER_DISPLAY_LIST_DL_OP_SPY_H_
5+
#ifndef FLUTTER_SHELL_COMMON_DL_OP_SPY_H_
6+
#define FLUTTER_SHELL_COMMON_DL_OP_SPY_H_
77

88
#include "flutter/display_list/dl_op_receiver.h"
99
#include "flutter/display_list/utils/dl_receiver_utils.h"
@@ -109,4 +109,4 @@ class DlOpSpy final : public virtual DlOpReceiver,
109109

110110
} // namespace flutter
111111

112-
#endif // FLUTTER_DISPLAY_LIST_DL_OP_SPY_H_
112+
#endif // FLUTTER_SHELL_COMMON_DL_OP_SPY_H_

shell/common/engine.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef SHELL_COMMON_ENGINE_H_
6-
#define SHELL_COMMON_ENGINE_H_
5+
#ifndef FLUTTER_SHELL_COMMON_ENGINE_H_
6+
#define FLUTTER_SHELL_COMMON_ENGINE_H_
77

88
#include <memory>
99
#include <string>
@@ -1039,4 +1039,4 @@ class Engine final : public RuntimeDelegate, PointerDataDispatcher::Delegate {
10391039

10401040
} // namespace flutter
10411041

1042-
#endif // SHELL_COMMON_ENGINE_H_
1042+
#endif // FLUTTER_SHELL_COMMON_ENGINE_H_

shell/common/platform_message_handler.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
6-
#define SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
5+
#ifndef FLUTTER_SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
6+
#define FLUTTER_SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
77

88
#include <memory>
99

@@ -45,4 +45,4 @@ class PlatformMessageHandler {
4545
};
4646
} // namespace flutter
4747

48-
#endif // SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_
48+
#endif // FLUTTER_SHELL_COMMON_PLATFORM_MESSAGE_HANDLER_H_

shell/common/platform_view.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef COMMON_PLATFORM_VIEW_H_
6-
#define COMMON_PLATFORM_VIEW_H_
5+
#ifndef FLUTTER_SHELL_COMMON_PLATFORM_VIEW_H_
6+
#define FLUTTER_SHELL_COMMON_PLATFORM_VIEW_H_
77

88
#include <functional>
99
#include <memory>
@@ -881,4 +881,4 @@ class PlatformView {
881881

882882
} // namespace flutter
883883

884-
#endif // COMMON_PLATFORM_VIEW_H_
884+
#endif // FLUTTER_SHELL_COMMON_PLATFORM_VIEW_H_

shell/common/pointer_data_dispatcher.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef POINTER_DATA_DISPATCHER_H_
6-
#define POINTER_DATA_DISPATCHER_H_
5+
#ifndef FLUTTER_SHELL_COMMON_POINTER_DATA_DISPATCHER_H_
6+
#define FLUTTER_SHELL_COMMON_POINTER_DATA_DISPATCHER_H_
77

88
#include "flutter/runtime/runtime_controller.h"
99
#include "flutter/shell/common/animator.h"
@@ -174,4 +174,4 @@ using PointerDataDispatcherMaker =
174174

175175
} // namespace flutter
176176

177-
#endif // POINTER_DATA_DISPATCHER_H_
177+
#endif // FLUTTER_SHELL_COMMON_POINTER_DATA_DISPATCHER_H_

shell/common/rasterizer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef SHELL_COMMON_RASTERIZER_H_
6-
#define SHELL_COMMON_RASTERIZER_H_
5+
#ifndef FLUTTER_SHELL_COMMON_RASTERIZER_H_
6+
#define FLUTTER_SHELL_COMMON_RASTERIZER_H_
77

88
#include <memory>
99
#include <optional>
@@ -735,4 +735,4 @@ class Rasterizer final : public SnapshotDelegate,
735735

736736
} // namespace flutter
737737

738-
#endif // SHELL_COMMON_RASTERIZER_H_
738+
#endif // FLUTTER_SHELL_COMMON_RASTERIZER_H_

shell/common/shell.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef SHELL_COMMON_SHELL_H_
6-
#define SHELL_COMMON_SHELL_H_
5+
#ifndef FLUTTER_SHELL_COMMON_SHELL_H_
6+
#define FLUTTER_SHELL_COMMON_SHELL_H_
77

88
#include <functional>
99
#include <mutex>
@@ -815,4 +815,4 @@ class Shell final : public PlatformView::Delegate,
815815

816816
} // namespace flutter
817817

818-
#endif // SHELL_COMMON_SHELL_H_
818+
#endif // FLUTTER_SHELL_COMMON_SHELL_H_

shell/common/shell_test_external_view_embedder.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef FLUTTER_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
6-
#define FLUTTER_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
5+
#ifndef FLUTTER_SHELL_COMMON_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
6+
#define FLUTTER_SHELL_COMMON_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
77

88
#include "flutter/flow/embedded_views.h"
99
#include "flutter/fml/raster_thread_merger.h"
@@ -111,4 +111,4 @@ class ShellTestExternalViewEmbedder final : public ExternalViewEmbedder {
111111

112112
} // namespace flutter
113113

114-
#endif // FLUTTER_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_
114+
#endif // FLUTTER_SHELL_COMMON_SHELL_TEST_EXTERNAL_VIEW_EMBEDDER_H_

shell/common/shell_test_platform_view.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,4 @@ class ShellTestPlatformViewBuilder {
6666
} // namespace testing
6767
} // namespace flutter
6868

69-
#endif // FLUTTER_SHELL_COMMON_SHELL_TEST_PLATFORM_VIEW_GL_H_
69+
#endif // FLUTTER_SHELL_COMMON_SHELL_TEST_PLATFORM_VIEW_H_

shell/common/snapshot_surface_producer.h

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
// Use of this source code is governed by a BSD-style license that can be
33
// found in the LICENSE file.
44

5-
#ifndef SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
6-
#define SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
5+
#ifndef FLUTTER_SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
6+
#define FLUTTER_SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
77

88
#include <memory>
99

@@ -19,4 +19,4 @@ class SnapshotSurfaceProducer {
1919
};
2020

2121
} // namespace flutter
22-
#endif // SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_
22+
#endif // FLUTTER_SHELL_COMMON_SNAPSHOT_SURFACE_PRODUCER_H_

0 commit comments

Comments
 (0)