summaryrefslogtreecommitdiffstats
path: root/components/view_manager
diff options
context:
space:
mode:
authorsky <sky@chromium.org>2015-04-23 10:19:12 -0700
committerCommit bot <commit-bot@chromium.org>2015-04-23 17:20:16 +0000
commit1093457528417f337e20a22bba7338c47e41128e (patch)
treee657ff86fdb394c0f55370ba1eb611b629c69692 /components/view_manager
parentdbd02135c2151024242ede4df95291ec0c4eb555 (diff)
downloadchromium_src-1093457528417f337e20a22bba7338c47e41128e.zip
chromium_src-1093457528417f337e20a22bba7338c47e41128e.tar.gz
chromium_src-1093457528417f337e20a22bba7338c47e41128e.tar.bz2
Fixes up viewmanager header guards
R=jam@chromium.org TBR=jam@chromium.org BUG=479353 TEST=none Review URL: https://codereview.chromium.org/1103723002 Cr-Commit-Position: refs/heads/master@{#326558}
Diffstat (limited to 'components/view_manager')
-rw-r--r--components/view_manager/public/cpp/keys.h6
-rw-r--r--components/view_manager/public/cpp/lib/view_manager_client_impl.h6
-rw-r--r--components/view_manager/public/cpp/lib/view_private.h6
-rw-r--r--components/view_manager/public/cpp/tests/view_manager_test_suite.h6
-rw-r--r--components/view_manager/public/cpp/types.h6
-rw-r--r--components/view_manager/public/cpp/util.h6
-rw-r--r--components/view_manager/public/cpp/view.h6
-rw-r--r--components/view_manager/public/cpp/view_manager.h6
-rw-r--r--components/view_manager/public/cpp/view_manager_client_factory.h6
-rw-r--r--components/view_manager/public/cpp/view_manager_context.h6
-rw-r--r--components/view_manager/public/cpp/view_manager_delegate.h6
-rw-r--r--components/view_manager/public/cpp/view_observer.h6
-rw-r--r--components/view_manager/public/cpp/view_property.h6
-rw-r--r--components/view_manager/public/cpp/view_tracker.h6
14 files changed, 42 insertions, 42 deletions
diff --git a/components/view_manager/public/cpp/keys.h b/components/view_manager/public/cpp/keys.h
index 77ca346f..ee6bcfe 100644
--- a/components/view_manager/public/cpp/keys.h
+++ b/components/view_manager/public/cpp/keys.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_KEYS_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_KEYS_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_KEYS_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_KEYS_H_
namespace mojo {
@@ -11,4 +11,4 @@ extern const char kViewManagerKeyWantsTouchEvents[];
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_KEYS_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_KEYS_H_
diff --git a/components/view_manager/public/cpp/lib/view_manager_client_impl.h b/components/view_manager/public/cpp/lib/view_manager_client_impl.h
index 96ffc66..e53785a 100644
--- a/components/view_manager/public/cpp/lib/view_manager_client_impl.h
+++ b/components/view_manager/public/cpp/lib/view_manager_client_impl.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
#include "components/view_manager/public/cpp/types.h"
#include "components/view_manager/public/cpp/view.h"
@@ -166,4 +166,4 @@ class ViewManagerClientImpl : public ViewManager,
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_MANAGER_CLIENT_IMPL_H_
diff --git a/components/view_manager/public/cpp/lib/view_private.h b/components/view_manager/public/cpp/lib/view_private.h
index ad1ab59..a63711e 100644
--- a/components/view_manager/public/cpp/lib/view_private.h
+++ b/components/view_manager/public/cpp/lib/view_private.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_
#include "components/view_manager/public/cpp/view.h"
@@ -69,4 +69,4 @@ class ViewPrivate {
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_LIB_VIEW_PRIVATE_H_
diff --git a/components/view_manager/public/cpp/tests/view_manager_test_suite.h b/components/view_manager/public/cpp/tests/view_manager_test_suite.h
index b03256a..1df8743 100644
--- a/components/view_manager/public/cpp/tests/view_manager_test_suite.h
+++ b/components/view_manager/public/cpp/tests/view_manager_test_suite.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_TESTS_VIEW_MANAGER_TEST_SUITE_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_TESTS_VIEW_MANAGER_TEST_SUITE_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_TESTS_VIEW_MANAGER_TEST_SUITE_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_TESTS_VIEW_MANAGER_TEST_SUITE_H_
#include "base/test/test_suite.h"
#include "third_party/mojo/src/mojo/public/cpp/system/macros.h"
@@ -24,4 +24,4 @@ class ViewManagerTestSuite : public base::TestSuite {
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_TESTS_VIEW_MANAGER_TEST_SUITE_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_TESTS_VIEW_MANAGER_TEST_SUITE_H_
diff --git a/components/view_manager/public/cpp/types.h b/components/view_manager/public/cpp/types.h
index 5652691..c8e55a7 100644
--- a/components/view_manager/public/cpp/types.h
+++ b/components/view_manager/public/cpp/types.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_TYPES_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_TYPES_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_TYPES_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_TYPES_H_
#include <stdint.h>
@@ -22,4 +22,4 @@ typedef uint16_t ConnectionSpecificId;
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_TYPES_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_TYPES_H_
diff --git a/components/view_manager/public/cpp/util.h b/components/view_manager/public/cpp/util.h
index 8e236c0..78a717c 100644
--- a/components/view_manager/public/cpp/util.h
+++ b/components/view_manager/public/cpp/util.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
#include "components/view_manager/public/cpp/types.h"
@@ -27,4 +27,4 @@ inline uint16_t LoWord(uint32_t id) {
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_UTIL_H_
diff --git a/components/view_manager/public/cpp/view.h b/components/view_manager/public/cpp/view.h
index 4028af0..e2e81cf 100644
--- a/components/view_manager/public/cpp/view.h
+++ b/components/view_manager/public/cpp/view.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
#include <stdint.h>
#include <vector>
@@ -207,4 +207,4 @@ class View {
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_H_
diff --git a/components/view_manager/public/cpp/view_manager.h b/components/view_manager/public/cpp/view_manager.h
index 01ad0e8..ee0b563 100644
--- a/components/view_manager/public/cpp/view_manager.h
+++ b/components/view_manager/public/cpp/view_manager.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
#include <string>
@@ -39,4 +39,4 @@ class ViewManager {
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_H_
diff --git a/components/view_manager/public/cpp/view_manager_client_factory.h b/components/view_manager/public/cpp/view_manager_client_factory.h
index 9e29be4..eaf42a4 100644
--- a/components/view_manager/public/cpp/view_manager_client_factory.h
+++ b/components/view_manager/public/cpp/view_manager_client_factory.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
#include "components/view_manager/public/interfaces/view_manager.mojom.h"
#include "third_party/mojo/src/mojo/public/cpp/application/interface_factory.h"
@@ -40,4 +40,4 @@ class ViewManagerClientFactory : public InterfaceFactory<ViewManagerClient> {
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CLIENT_FACTORY_H_
diff --git a/components/view_manager/public/cpp/view_manager_context.h b/components/view_manager/public/cpp/view_manager_context.h
index 5928727..09b1ce3 100644
--- a/components/view_manager/public/cpp/view_manager_context.h
+++ b/components/view_manager/public/cpp/view_manager_context.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CONTEXT_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CONTEXT_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CONTEXT_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CONTEXT_H_
#include <string>
#include <vector>
@@ -43,4 +43,4 @@ class ViewManagerContext {
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CONTEXT_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_CONTEXT_H_
diff --git a/components/view_manager/public/cpp/view_manager_delegate.h b/components/view_manager/public/cpp/view_manager_delegate.h
index 1e16d1d..fa6f49d 100644
--- a/components/view_manager/public/cpp/view_manager_delegate.h
+++ b/components/view_manager/public/cpp/view_manager_delegate.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_DELEGATE_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_DELEGATE_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_DELEGATE_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_DELEGATE_H_
#include <string>
@@ -49,4 +49,4 @@ class ViewManagerDelegate {
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_DELEGATE_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_MANAGER_DELEGATE_H_
diff --git a/components/view_manager/public/cpp/view_observer.h b/components/view_manager/public/cpp/view_observer.h
index f1166af..a89b449 100644
--- a/components/view_manager/public/cpp/view_observer.h
+++ b/components/view_manager/public/cpp/view_observer.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
#include <vector>
@@ -103,4 +103,4 @@ class ViewObserver {
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_OBSERVER_H_
diff --git a/components/view_manager/public/cpp/view_property.h b/components/view_manager/public/cpp/view_property.h
index 3222fe7..2f10aff 100644
--- a/components/view_manager/public/cpp/view_property.h
+++ b/components/view_manager/public/cpp/view_property.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
#include <stdint.h>
@@ -137,4 +137,4 @@ void View::ClearLocalProperty(const ViewProperty<T>* property) {
} \
const mojo::ViewProperty<TYPE*>* const NAME = &NAME##_Value;
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_PROPERTY_H_
diff --git a/components/view_manager/public/cpp/view_tracker.h b/components/view_manager/public/cpp/view_tracker.h
index bfa8f5c..ed1a0d28 100644
--- a/components/view_manager/public/cpp/view_tracker.h
+++ b/components/view_manager/public/cpp/view_tracker.h
@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-#ifndef MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_
-#define MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_
+#ifndef COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_
+#define COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_
#include <stdint.h>
#include <set>
@@ -44,4 +44,4 @@ class ViewTracker : public ViewObserver {
} // namespace mojo
-#endif // MOJO_SERVICES_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_
+#endif // COMPONENTS_VIEW_MANAGER_PUBLIC_CPP_VIEW_TRACKER_H_