11 files changed, 11 insertions, 11 deletions
diff --git a/chrome/browser/views/tabs/browser_tab_strip.h b/chrome/browser/views/tabs/browser_tab_strip.h
index 5ed7353..69b5852 100644
--- a/chrome/browser/views/tabs/browser_tab_strip.h
+++ b/chrome/browser/views/tabs/browser_tab_strip.h
@@ -79,4 +79,4 @@ class BrowserTabStrip : public TabStrip2Model,
   DISALLOW_COPY_AND_ASSIGN(BrowserTabStrip);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_BROWSER_TAB_STRIP_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_BROWSER_TAB_STRIP_H_
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.h b/chrome/browser/views/tabs/dragged_tab_controller.h
index d4e33c5..c609db6 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.h
+++ b/chrome/browser/views/tabs/dragged_tab_controller.h
@@ -39,7 +39,7 @@ class TabStripModel;
 ///////////////////////////////////////////////////////////////////////////////
 class DraggedTabController : public TabContentsDelegate,
                              public NotificationObserver,
-                             public MessageLoopForUI::Observer{
+                             public MessageLoopForUI::Observer {
  public:
   DraggedTabController(Tab* source_tab, TabStrip* source_tabstrip);
   virtual ~DraggedTabController();
diff --git a/chrome/browser/views/tabs/grid.cc b/chrome/browser/views/tabs/grid.cc
index fae3ff7..4924956 100644
--- a/chrome/browser/views/tabs/grid.cc
+++ b/chrome/browser/views/tabs/grid.cc
@@ -8,7 +8,7 @@
 
 using views::View;
 
-//static
+// static
 const int Grid::kCellXPadding = 15;
 // static
 const int Grid::kCellYPadding = 15;
diff --git a/chrome/browser/views/tabs/native_view_photobooth.h b/chrome/browser/views/tabs/native_view_photobooth.h
index 913cb0d..0aa930a 100644
--- a/chrome/browser/views/tabs/native_view_photobooth.h
+++ b/chrome/browser/views/tabs/native_view_photobooth.h
@@ -40,4 +40,4 @@ class NativeViewPhotobooth {
                                          const gfx::Rect& target_bounds) = 0;
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_H_
diff --git a/chrome/browser/views/tabs/native_view_photobooth_gtk.h b/chrome/browser/views/tabs/native_view_photobooth_gtk.h
index 6082f52..791b8c5 100644
--- a/chrome/browser/views/tabs/native_view_photobooth_gtk.h
+++ b/chrome/browser/views/tabs/native_view_photobooth_gtk.h
@@ -26,4 +26,4 @@ class NativeViewPhotoboothGtk : public NativeViewPhotobooth {
   DISALLOW_COPY_AND_ASSIGN(NativeViewPhotoboothGtk);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_GTK_H_
diff --git a/chrome/browser/views/tabs/native_view_photobooth_win.h b/chrome/browser/views/tabs/native_view_photobooth_win.h
index 6429380..fd59afa 100644
--- a/chrome/browser/views/tabs/native_view_photobooth_win.h
+++ b/chrome/browser/views/tabs/native_view_photobooth_win.h
@@ -54,4 +54,4 @@ class NativeViewPhotoboothWin : public NativeViewPhotobooth {
   DISALLOW_COPY_AND_ASSIGN(NativeViewPhotoboothWin);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_NATIVE_VIEW_PHOTOBOOTH_WIN_H_
diff --git a/chrome/browser/views/tabs/tab_2.h b/chrome/browser/views/tabs/tab_2.h
index 079d39c..58e5909 100644
--- a/chrome/browser/views/tabs/tab_2.h
+++ b/chrome/browser/views/tabs/tab_2.h
@@ -245,4 +245,4 @@ class Tab2 : public views::View,
   DISALLOW_COPY_AND_ASSIGN(Tab2);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_2_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_TAB_2_H_
diff --git a/chrome/browser/views/tabs/tab_overview_types.h b/chrome/browser/views/tabs/tab_overview_types.h
index b70a89d..a2b41be 100644
--- a/chrome/browser/views/tabs/tab_overview_types.h
+++ b/chrome/browser/views/tabs/tab_overview_types.h
@@ -147,7 +147,7 @@ class TabOverviewTypes {
     Message() {
       Init(UNKNOWN);
     }
-    Message(Type type) {
+    explicit Message(Type type) {
       Init(type);
     }
 
diff --git a/chrome/browser/views/tabs/tab_strip.cc b/chrome/browser/views/tabs/tab_strip.cc
index eef7b01..35328af 100644
--- a/chrome/browser/views/tabs/tab_strip.cc
+++ b/chrome/browser/views/tabs/tab_strip.cc
@@ -723,7 +723,7 @@ TabStrip::TabStrip(TabStripModel* model)
 
 TabStrip::~TabStrip() {
   // TODO(beng): (1031854) Restore this line once XPFrame/VistaFrame are dead.
-  //model_->RemoveObserver(this);
+  // model_->RemoveObserver(this);
 
   // TODO(beng): remove this if it doesn't work to fix the TabSelectedAt bug.
   drag_controller_.reset(NULL);
diff --git a/chrome/browser/views/tabs/tab_strip_2.cc b/chrome/browser/views/tabs/tab_strip_2.cc
index 626a78d..e19a31b 100644
--- a/chrome/browser/views/tabs/tab_strip_2.cc
+++ b/chrome/browser/views/tabs/tab_strip_2.cc
@@ -190,7 +190,7 @@ void TabStrip2::DetachDragEnded() {
       gfx::Point screen_point = views::Screen::GetCursorScreenPoint();
       gfx::Rect tsb = GetDraggedTabScreenBounds(screen_point);
       // TODO(beng): figure this one out.
-      //drop_tabstrip_->AttachTab(tabstrip->DetachTab(0), screen_point, tsb);
+      // drop_tabstrip_->AttachTab(tabstrip->DetachTab(0), screen_point, tsb);
     } else {
       GetWindow()->SetUseDragFrame(detached_drag_mode_);
       SendDraggedTabHome();
diff --git a/chrome/browser/views/tabs/tab_strip_2.h b/chrome/browser/views/tabs/tab_strip_2.h
index dc61569..02f016e 100644
--- a/chrome/browser/views/tabs/tab_strip_2.h
+++ b/chrome/browser/views/tabs/tab_strip_2.h
@@ -199,4 +199,4 @@ class TabStrip2 : public views::View,
   DISALLOW_COPY_AND_ASSIGN(TabStrip2);
 };
 
-#endif  // #ifndef CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_2_H_
+#endif  // CHROME_BROWSER_VIEWS_TABS_TAB_STRIP_2_H_