8 files changed, 25 insertions, 25 deletions
diff --git a/chrome/views/widget/accelerator_handler.h b/chrome/views/widget/accelerator_handler.h
index f71be26..6c2278c 100644
--- a/chrome/views/widget/accelerator_handler.h
+++ b/chrome/views/widget/accelerator_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 CHROME_VIEWS_ACCELERATOR_HANDLER_H__
-#define CHROME_VIEWS_ACCELERATOR_HANDLER_H__
+#ifndef CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
+#define CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
 
 #include "base/message_loop.h"
 
@@ -27,4 +27,4 @@ class AcceleratorHandler : public MessageLoopForUI::Dispatcher {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_ACCELERATOR_HANDLER_H__
+#endif  // CHROME_VIEWS_WIDGET_ACCELERATOR_HANDLER_H_
diff --git a/chrome/views/widget/aero_tooltip_manager.h b/chrome/views/widget/aero_tooltip_manager.h
index 17fab05..fac5a39 100644
--- a/chrome/views/widget/aero_tooltip_manager.h
+++ b/chrome/views/widget/aero_tooltip_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 CHROME_VIEWS_AERO_TOOLTIP_MANAGER_H__
-#define CHROME_VIEWS_AERO_TOOLTIP_MANAGER_H__
+#ifndef CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
+#define CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
 
 #include "base/ref_counted.h"
 #include "base/task.h"
@@ -54,4 +54,4 @@ class AeroTooltipManager : public TooltipManager {
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_AERO_TOOLTIP_MANAGER_H__
+#endif  // #ifndef CHROME_VIEWS_WIDGET_AERO_TOOLTIP_MANAGER_H_
diff --git a/chrome/views/widget/hwnd_notification_source.h b/chrome/views/widget/hwnd_notification_source.h
index 9f33c2b..602ae44 100644
--- a/chrome/views/widget/hwnd_notification_source.h
+++ b/chrome/views/widget/hwnd_notification_source.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 CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__
-#define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__
+#ifndef CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H_
+#define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H_
 
 #include "chrome/common/notification_source.h"
 
@@ -21,4 +21,4 @@ class Source<HWND> : public NotificationSource {
   HWND ptr() const { return static_cast<HWND>(ptr_); }
 };
 
-#endif  // #define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H__
+#endif  // #define CHROME_VIEWS_WIDGET_HWND_NOTIFICATION_SOURCE_H_
diff --git a/chrome/views/widget/root_view.h b/chrome/views/widget/root_view.h
index 57ea710..a97f2ec 100644
--- a/chrome/views/widget/root_view.h
+++ b/chrome/views/widget/root_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 CHROME_VIEWS_ROOT_VIEW_H__
-#define CHROME_VIEWS_ROOT_VIEW_H__
+#ifndef CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
+#define CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
 
 #include "base/ref_counted.h"
 #include "chrome/views/focus_manager.h"
@@ -355,4 +355,4 @@ class RootView : public View,
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_ROOT_VIEW_H__
+#endif // CHROME_VIEWS_WIDGET_ROOT_VIEW_H_
diff --git a/chrome/views/widget/root_view_drop_target.h b/chrome/views/widget/root_view_drop_target.h
index 72a5a87..02ce6c6 100644
--- a/chrome/views/widget/root_view_drop_target.h
+++ b/chrome/views/widget/root_view_drop_target.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 CHROME_VIEWS_ROOT_VIEW_DROP_TARGET_H__
-#define CHROME_VIEWS_ROOT_VIEW_DROP_TARGET_H__
+#ifndef CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
+#define CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
 
 #include <atlbase.h>
 #include <atlapp.h>
@@ -72,4 +72,4 @@ class RootViewDropTarget : public BaseDropTarget {
 
 }  // namespace views
 
-#endif  // CHROME_VIEWS_ROOT_VIEW_DROP_TARGET_H__
+#endif  // CHROME_VIEWS_WIDGET_ROOT_VIEW_DROP_TARGET_H_
diff --git a/chrome/views/widget/tooltip_manager.h b/chrome/views/widget/tooltip_manager.h
index 2800fb0..312e30e 100644
--- a/chrome/views/widget/tooltip_manager.h
+++ b/chrome/views/widget/tooltip_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 CHROME_VIEWS_TOOLTIP_MANAGER_H_
-#define CHROME_VIEWS_TOOLTIP_MANAGER_H_
+#ifndef CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
+#define CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
 
 #include <windows.h>
 #include <string>
@@ -153,7 +153,7 @@ class TooltipManager {
   // control window for tooltip displayed using keyboard.
   HWND keyboard_tooltip_hwnd_;
 
-  // Used to register DestroyTooltipWindow function with postdelayedtask
+  // Used to register DestroyTooltipWindow function with PostDelayedTask
   // function.
   ScopedRunnableMethodFactory<TooltipManager> keyboard_tooltip_factory_;
 
@@ -162,4 +162,4 @@ class TooltipManager {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_TOOLTIP_MANAGER_H_
+#endif // CHROME_VIEWS_WIDGET_TOOLTIP_MANAGER_H_
diff --git a/chrome/views/widget/widget.h b/chrome/views/widget/widget.h
index 46aa754..d1d0fff 100644
--- a/chrome/views/widget/widget.h
+++ b/chrome/views/widget/widget.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 CHROME_VIEWS_WIDGET_H_
-#define CHROME_VIEWS_WIDGET_H_
+#ifndef CHROME_VIEWS_WIDGET_WIDGET_H_
+#define CHROME_VIEWS_WIDGET_WIDGET_H_
 
 #include "base/gfx/native_widget_types.h"
 
@@ -82,4 +82,4 @@ class Widget {
 
 }  // namespace views
 
-#endif // CHROME_VIEWS_WIDGET_H_
+#endif // CHROME_VIEWS_WIDGET_WIDGET_H_
diff --git a/chrome/views/widget/widget_win.h b/chrome/views/widget/widget_win.h
index d5d5bad..c9fe810 100644
--- a/chrome/views/widget/widget_win.h
+++ b/chrome/views/widget/widget_win.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 CHROME_VIEWS_WIDGET_WIN_H_
-#define CHROME_VIEWS_WIDGET_WIN_H_
+#ifndef CHROME_VIEWS_WIDGET_WIDGET_WIN_H_
+#define CHROME_VIEWS_WIDGET_WIDGET_WIN_H_
 
 #include <atlbase.h>
 #include <atlcrack.h>
@@ -632,4 +632,4 @@ class WidgetWin : public Widget,
 
 }  // namespace views
 
-#endif  // #ifndef CHROME_VIEWS_WIDGET_WIN_H_
+#endif  // #ifndef CHROME_VIEWS_WIDGET_WIDGET_WIN_H_