Browse Source

Fix build/header_guard linter violations in brightray

Kevin Sawicki 8 years ago
parent
commit
cfb5b6ac89
41 changed files with 96 additions and 89 deletions
  1. 1 1
      brightray/CPPLINT.cfg
  2. 3 3
      brightray/browser/brightray_paths.h
  3. 1 1
      brightray/browser/browser_client.h
  4. 1 1
      brightray/browser/browser_context.h
  5. 1 1
      brightray/browser/browser_main_parts.h
  6. 3 3
      brightray/browser/devtools_file_system_indexer.h
  7. 3 3
      brightray/browser/devtools_manager_delegate.h
  8. 1 1
      brightray/browser/devtools_ui.h
  9. 3 3
      brightray/browser/inspectable_web_contents.h
  10. 3 3
      brightray/browser/inspectable_web_contents_delegate.h
  11. 1 1
      brightray/browser/inspectable_web_contents_impl.h
  12. 1 1
      brightray/browser/inspectable_web_contents_view.h
  13. 3 3
      brightray/browser/inspectable_web_contents_view_delegate.h
  14. 1 1
      brightray/browser/inspectable_web_contents_view_mac.h
  15. 3 3
      brightray/browser/linux/libnotify_notification.h
  16. 3 3
      brightray/browser/linux/notification_presenter_linux.h
  17. 3 3
      brightray/browser/mac/cocoa_notification.h
  18. 3 3
      brightray/browser/mac/notification_presenter_mac.h
  19. 3 3
      brightray/browser/net/devtools_network_conditions.h
  20. 3 3
      brightray/browser/net/devtools_network_controller.h
  21. 3 3
      brightray/browser/net/devtools_network_controller_handle.h
  22. 3 3
      brightray/browser/net/devtools_network_interceptor.h
  23. 3 3
      brightray/browser/net/devtools_network_protocol_handler.h
  24. 3 3
      brightray/browser/net/devtools_network_transaction.h
  25. 3 3
      brightray/browser/net/devtools_network_transaction_factory.h
  26. 3 3
      brightray/browser/net/devtools_network_upload_data_stream.h
  27. 3 3
      brightray/browser/net_log.h
  28. 1 1
      brightray/browser/network_delegate.h
  29. 3 3
      brightray/browser/notification.h
  30. 3 3
      brightray/browser/notification_delegate.h
  31. 3 3
      brightray/browser/notification_delegate_adapter.h
  32. 1 1
      brightray/browser/notification_presenter.h
  33. 3 3
      brightray/browser/permission_manager.h
  34. 3 3
      brightray/browser/platform_notification_service.h
  35. 1 1
      brightray/browser/url_request_context_getter.h
  36. 1 1
      brightray/browser/web_ui_controller_factory.h
  37. 1 1
      brightray/common/application_info.h
  38. 1 1
      brightray/common/content_client.h
  39. 1 1
      brightray/common/mac/main_application_bundle.h
  40. 2 1
      brightray/common/main_delegate.h
  41. 7 1
      script/cpplint.py

+ 1 - 1
brightray/CPPLINT.cfg

@@ -1 +1 @@
-filter=-build/header_guard,-build/include_what_you_use,-legal/copyright,-runtime/references
+filter=-build/include_what_you_use,-legal/copyright,-runtime/references

+ 3 - 3
brightray/browser/brightray_paths.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 BROWSER_BRIGHTRAY_PATHS_H_
-#define BROWSER_BRIGHTRAY_PATHS_H_
+#ifndef BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_
+#define BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_
 
 #if defined(OS_WIN)
 #include "base/base_paths_win.h"
@@ -40,4 +40,4 @@ enum {
 
 }  // namespace brightray
 
-#endif  // BROWSER_BRIGHTRAY_PATHS_H_
+#endif  // BRIGHTRAY_BROWSER_BRIGHTRAY_PATHS_H_

+ 1 - 1
brightray/browser/browser_client.h

@@ -64,4 +64,4 @@ class BrowserClient : public content::ContentBrowserClient {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_BROWSER_CLIENT_H_

+ 1 - 1
brightray/browser/browser_context.h

@@ -140,4 +140,4 @@ class BrowserContext : public base::RefCounted<BrowserContext>,
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_BROWSER_CONTEXT_H_

+ 1 - 1
brightray/browser/browser_main_parts.h

@@ -57,4 +57,4 @@ class BrowserMainParts : public content::BrowserMainParts {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_BROWSER_MAIN_PARTS_H_

+ 3 - 3
brightray/browser/devtools_file_system_indexer.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 BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
-#define BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
+#ifndef BRIGHTRAY_BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
+#define BRIGHTRAY_BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
 
 #include <stdint.h>
 
@@ -112,4 +112,4 @@ class DevToolsFileSystemIndexer
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_
+#endif  // BRIGHTRAY_BROWSER_DEVTOOLS_FILE_SYSTEM_INDEXER_H_

+ 3 - 3
brightray/browser/devtools_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-CHROMIUM file.
 
-#ifndef BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
-#define BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
+#ifndef BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
+#define BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
 
 #include "base/macros.h"
 #include "base/compiler_specific.h"
@@ -38,4 +38,4 @@ class DevToolsManagerDelegate : public content::DevToolsManagerDelegate {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_
+#endif  // BRIGHTRAY_BROWSER_DEVTOOLS_MANAGER_DELEGATE_H_

+ 1 - 1
brightray/browser/devtools_ui.h

@@ -24,4 +24,4 @@ class DevToolsUI : public content::WebUIController {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_DEVTOOLS_UI_H_

+ 3 - 3
brightray/browser/inspectable_web_contents.h

@@ -1,5 +1,5 @@
-#ifndef BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_H_
-#define BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_H_
+#ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_
+#define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_
 
 #include "content/public/browser/web_contents.h"
 
@@ -50,4 +50,4 @@ class InspectableWebContents {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_H_

+ 3 - 3
brightray/browser/inspectable_web_contents_delegate.h

@@ -1,5 +1,5 @@
-#ifndef BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
-#define BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
+#ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
+#define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
 
 #include <string>
 
@@ -31,4 +31,4 @@ class InspectableWebContentsDelegate {
 
 }  // namespace brightray
 
-#endif  // BRIGHTRAY_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_DELEGATE_H_

+ 1 - 1
brightray/browser/inspectable_web_contents_impl.h

@@ -195,4 +195,4 @@ class InspectableWebContentsImpl :
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_IMPL_H_

+ 1 - 1
brightray/browser/inspectable_web_contents_view.h

@@ -56,4 +56,4 @@ class InspectableWebContentsView {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_H_

+ 3 - 3
brightray/browser/inspectable_web_contents_view_delegate.h

@@ -1,5 +1,5 @@
-#ifndef BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
-#define BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
+#ifndef BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
+#define BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
 
 #include "ui/gfx/image/image_skia.h"
 
@@ -25,4 +25,4 @@ class InspectableWebContentsViewDelegate {
 
 }  // namespace brightray
 
-#endif  // BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_DELEGATE_H_

+ 1 - 1
brightray/browser/inspectable_web_contents_view_mac.h

@@ -42,4 +42,4 @@ class InspectableWebContentsViewMac : public InspectableWebContentsView {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_INSPECTABLE_WEB_CONTENTS_VIEW_MAC_H_

+ 3 - 3
brightray/browser/linux/libnotify_notification.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
-#define BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
+#ifndef BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
+#define BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
 
 #include "browser/linux/libnotify_loader.h"
 #include "browser/notification.h"
@@ -41,4 +41,4 @@ class LibnotifyNotification : public Notification {
 
 }  // namespace brightray
 
-#endif  // BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_
+#endif  // BRIGHTRAY_BROWSER_LINUX_LIBNOTIFY_NOTIFICATION_H_

+ 3 - 3
brightray/browser/linux/notification_presenter_linux.h

@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_LINUX_H_
-#define BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_LINUX_H_
+#ifndef BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
+#define BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_
 
 #include "browser/notification_presenter.h"
 
@@ -24,4 +24,4 @@ class NotificationPresenterLinux : public NotificationPresenter {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_LINUX_NOTIFICATION_PRESENTER_LINUX_H_

+ 3 - 3
brightray/browser/mac/cocoa_notification.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_MAC_COCOA_NOTIFICATION_H_
-#define BROWSER_MAC_COCOA_NOTIFICATION_H_
+#ifndef BRIGHTRAY_BROWSER_MAC_COCOA_NOTIFICATION_H_
+#define BRIGHTRAY_BROWSER_MAC_COCOA_NOTIFICATION_H_
 
 #import <Foundation/Foundation.h>
 
@@ -39,4 +39,4 @@ class CocoaNotification : public Notification {
 
 }  // namespace brightray
 
-#endif  // BROWSER_MAC_COCOA_NOTIFICATION_H_
+#endif  // BRIGHTRAY_BROWSER_MAC_COCOA_NOTIFICATION_H_

+ 3 - 3
brightray/browser/mac/notification_presenter_mac.h

@@ -3,8 +3,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_MAC_H_
-#define BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_MAC_H_
+#ifndef BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_
+#define BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_
 
 #include "base/mac/scoped_nsobject.h"
 #include "browser/mac/notification_center_delegate.h"
@@ -33,4 +33,4 @@ class NotificationPresenterMac : public NotificationPresenter {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_MAC_NOTIFICATION_PRESENTER_MAC_H_

+ 3 - 3
brightray/browser/net/devtools_network_conditions.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 BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_
-#define BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_
 
 #include "base/macros.h"
 
@@ -36,4 +36,4 @@ class DevToolsNetworkConditions {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_CONDITIONS_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONDITIONS_H_

+ 3 - 3
brightray/browser/net/devtools_network_controller.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_CONTROLLER_H_
-#define BROWSER_DEVTOOLS_NETWORK_CONTROLLER_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_
 
 #include <unordered_map>
 #include <memory>
@@ -41,4 +41,4 @@ class DevToolsNetworkController {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_CONTROLLER_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_H_

+ 3 - 3
brightray/browser/net/devtools_network_controller_handle.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
-#define BROWSER_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
 
 #include <memory>
 #include <string>
@@ -42,4 +42,4 @@ class DevToolsNetworkControllerHandle {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_CONTROLLER_HANDLE_H_

+ 3 - 3
brightray/browser/net/devtools_network_interceptor.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 BROWSER_DEVTOOLS_NETWORK_INTERCEPTOR_H_
-#define BROWSER_DEVTOOLS_NETWORK_INTERCEPTOR_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_INTERCEPTOR_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_INTERCEPTOR_H_
 
 #include <string>
 #include <utility>
@@ -104,4 +104,4 @@ class DevToolsNetworkInterceptor {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_INTERCEPTOR_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_INTERCEPTOR_H_

+ 3 - 3
brightray/browser/net/devtools_network_protocol_handler.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 BROWSER_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
-#define BROWSER_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
 
 #include "base/macros.h"
 #include "base/values.h"
@@ -45,4 +45,4 @@ class DevToolsNetworkProtocolHandler {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_PROTOCOL_HANDLER_H_

+ 3 - 3
brightray/browser/net/devtools_network_transaction.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 BROWSER_DEVTOOLS_NETWORK_TRANSACTION_H_
-#define BROWSER_DEVTOOLS_NETWORK_TRANSACTION_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_H_
 
 #include <stdint.h>
 
@@ -104,4 +104,4 @@ class DevToolsNetworkTransaction : public net::HttpTransaction {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_TRANSACTION_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_H_

+ 3 - 3
brightray/browser/net/devtools_network_transaction_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-CHROMIUM file.
 
-#ifndef BROWSER_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
-#define BROWSER_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
 
 #include "base/macros.h"
 #include "net/base/request_priority.h"
@@ -36,4 +36,4 @@ class DevToolsNetworkTransactionFactory : public net::HttpTransactionFactory {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_TRANSACTION_FACTORY_H_

+ 3 - 3
brightray/browser/net/devtools_network_upload_data_stream.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 BROWSER_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
-#define BROWSER_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
+#ifndef BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
+#define BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
 
 #include <stdint.h>
 
@@ -47,4 +47,4 @@ class DevToolsNetworkUploadDataStream : public net::UploadDataStream {
 
 }  // namespace brightray
 
-#endif  // BROWSER_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_
+#endif  // BRIGHTRAY_BROWSER_NET_DEVTOOLS_NETWORK_UPLOAD_DATA_STREAM_H_

+ 3 - 3
brightray/browser/net_log.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_NET_LOG_H_
-#define BROWSER_NET_LOG_H_
+#ifndef BRIGHTRAY_BROWSER_NET_LOG_H_
+#define BRIGHTRAY_BROWSER_NET_LOG_H_
 
 #include "base/files/scoped_file.h"
 #include "net/log/net_log.h"
@@ -27,4 +27,4 @@ class NetLog : public net::NetLog {
 
 }  // namespace brightray
 
-#endif  // BROWSER_NET_LOG_H_
+#endif  // BRIGHTRAY_BROWSER_NET_LOG_H_

+ 1 - 1
brightray/browser/network_delegate.h

@@ -76,4 +76,4 @@ class NetworkDelegate : public net::NetworkDelegate {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_NETWORK_DELEGATE_H_

+ 3 - 3
brightray/browser/notification.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_NOTIFICATION_H_
-#define BROWSER_NOTIFICATION_H_
+#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_H_
+#define BRIGHTRAY_BROWSER_NOTIFICATION_H_
 
 #include "base/memory/weak_ptr.h"
 #include "base/strings/string16.h"
@@ -62,4 +62,4 @@ class Notification {
 
 }  // namespace brightray
 
-#endif  // BROWSER_NOTIFICATION_H_
+#endif  // BRIGHTRAY_BROWSER_NOTIFICATION_H_

+ 3 - 3
brightray/browser/notification_delegate.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_NOTIFICATION_DELEGATE_H_
-#define BROWSER_NOTIFICATION_DELEGATE_H_
+#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_
+#define BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_
 
 #include "content/public/browser/desktop_notification_delegate.h"
 
@@ -20,4 +20,4 @@ class NotificationDelegate : public content::DesktopNotificationDelegate {
 
 }  // namespace brightray
 
-#endif  // BROWSER_NOTIFICATION_DELEGATE_H_
+#endif  // BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_H_

+ 3 - 3
brightray/browser/notification_delegate_adapter.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by the MIT license that can be
 // found in the LICENSE file.
 
-#ifndef BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
-#define BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
+#ifndef BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
+#define BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
 
 #include <memory>
 
@@ -35,4 +35,4 @@ class NotificationDelegateAdapter : public NotificationDelegate {
 
 }  // namespace brightray
 
-#endif  // BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_
+#endif  // BRIGHTRAY_BROWSER_NOTIFICATION_DELEGATE_ADAPTER_H_

+ 1 - 1
brightray/browser/notification_presenter.h

@@ -42,4 +42,4 @@ class NotificationPresenter {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_NOTIFICATION_PRESENTER_H_

+ 3 - 3
brightray/browser/permission_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-CHROMIUM file.
 
-#ifndef BROWSER_PERMISSION_MANAGER_H_
-#define BROWSER_PERMISSION_MANAGER_H_
+#ifndef BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_
+#define BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_
 
 #include "base/callback_forward.h"
 #include "base/macros.h"
@@ -54,4 +54,4 @@ class PermissionManager : public content::PermissionManager {
 
 }  // namespace brightray
 
-#endif  // BROWSER_PERMISSION_MANAGER_H_
+#endif  // BRIGHTRAY_BROWSER_PERMISSION_MANAGER_H_

+ 3 - 3
brightray/browser/platform_notification_service.h

@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE-CHROMIUM file.
 
-#ifndef BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
-#define BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
+#ifndef BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
+#define BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
 
 #include "content/public/browser/browser_context.h"
 #include "content/public/browser/platform_notification_service.h"
@@ -58,4 +58,4 @@ class PlatformNotificationService
 
 }  // namespace brightray
 
-#endif  // BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_
+#endif  // BRIGHTRAY_BROWSER_PLATFORM_NOTIFICATION_SERVICE_H_

+ 1 - 1
brightray/browser/url_request_context_getter.h

@@ -120,4 +120,4 @@ class URLRequestContextGetter : public net::URLRequestContextGetter {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_URL_REQUEST_CONTEXT_GETTER_H_

+ 1 - 1
brightray/browser/web_ui_controller_factory.h

@@ -42,4 +42,4 @@ class WebUIControllerFactory : public content::WebUIControllerFactory {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_BROWSER_WEB_UI_CONTROLLER_FACTORY_H_

+ 1 - 1
brightray/common/application_info.h

@@ -10,4 +10,4 @@ std::string GetApplicationVersion();
 
 }
 
-#endif
+#endif  // BRIGHTRAY_COMMON_APPLICATION_INFO_H_

+ 1 - 1
brightray/common/content_client.h

@@ -31,4 +31,4 @@ class ContentClient : public content::ContentClient {
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_COMMON_CONTENT_CLIENT_H_

+ 1 - 1
brightray/common/mac/main_application_bundle.h

@@ -18,4 +18,4 @@ base::FilePath MainApplicationBundlePath();
 
 }  // namespace brightray
 
-#endif
+#endif  // BRIGHTRAY_COMMON_MAC_MAIN_APPLICATION_BUNDLE_H_

+ 2 - 1
brightray/common/main_delegate.h

@@ -60,4 +60,5 @@ class MainDelegate : public content::ContentMainDelegate {
 };
 
 }  // namespace brightray
-#endif
+
+#endif  // BRIGHTRAY_COMMON_MAIN_DELEGATE_H_

+ 7 - 1
script/cpplint.py

@@ -22,10 +22,16 @@ IGNORE_FILES = [
   os.path.join('brightray', 'browser', 'mac', 'event_dispatching_window.h'),
   os.path.join('brightray', 'browser', 'mac',
                'notification_center_delegate.h'),
+  os.path.join('brightray', 'browser', 'win', 'notification_presenter_win7.h'),
+  os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications',
+               'common.h'),
   os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications',
                'desktop_notification_controller.cc'),
   os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications',
-               'desktop_notification_controller.h')
+               'desktop_notification_controller.h'),
+  os.path.join('brightray', 'browser', 'win', 'win32_desktop_notifications',
+               'toast.h'),
+  os.path.join('brightray', 'browser', 'win', 'win32_notification.h')
 ]
 
 SOURCE_ROOT = os.path.abspath(os.path.dirname(os.path.dirname(__file__)))