9 files changed, 23 insertions, 13 deletions
diff --git a/chrome/browser/views/about_ipc_dialog.cc b/chrome/browser/views/about_ipc_dialog.cc
index 4abc588..d1a92dc 100644
--- a/chrome/browser/views/about_ipc_dialog.cc
+++ b/chrome/browser/views/about_ipc_dialog.cc
@@ -232,7 +232,8 @@ INT_PTR CALLBACK DialogProc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) {
       break;
     case WM_NOTIFY: {
       NMLISTVIEW* info = reinterpret_cast<NM_LISTVIEW*>(lparam);
-      if ((wparam == IDC_View || wparam == IDC_ViewHost || wparam == IDC_Plugin ||
+      if ((wparam == IDC_View || wparam == IDC_ViewHost ||
+           wparam == IDC_Plugin ||
            wparam == IDC_PluginHost || wparam == IDC_NPObject ||
            wparam == IDC_PluginProcess || wparam == IDC_PluginProcessHost) &&
           info->hdr.code == LVN_ITEMCHANGED) {
diff --git a/chrome/browser/views/about_network_dialog.cc b/chrome/browser/views/about_network_dialog.cc
index 1f25ec8..9631a3e 100644
--- a/chrome/browser/views/about_network_dialog.cc
+++ b/chrome/browser/views/about_network_dialog.cc
@@ -324,7 +324,8 @@ void AboutNetworkDialog::SetupControls() {
 
   static const int text_column_set = 2;
   column_set = layout->AddColumnSet(text_column_set);
-  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 100.0f,
+  column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL,
+                        100.0f,
                         views::GridLayout::FIXED, 0, 0);
 
   layout->StartRow(0, first_column_set);
diff --git a/chrome/browser/views/frame/glass_browser_frame_view.cc b/chrome/browser/views/frame/glass_browser_frame_view.cc
index 55e8d5b..6c19083 100644
--- a/chrome/browser/views/frame/glass_browser_frame_view.cc
+++ b/chrome/browser/views/frame/glass_browser_frame_view.cc
@@ -67,7 +67,8 @@ SkBitmap* GlassBrowserWindowResources::standard_frame_bitmaps_[];
 
 GlassBrowserWindowResources* GlassBrowserFrameView::resources_ = NULL;
 SkBitmap* GlassBrowserFrameView::distributor_logo_ = NULL;
-HICON GlassBrowserFrameView::throbber_icons_[GlassBrowserFrameView::kThrobberIconCount];
+HICON GlassBrowserFrameView::throbber_icons_[
+    GlassBrowserFrameView::kThrobberIconCount];
 
 namespace {
 // There are 3 px of client edge drawn inside the outer frame borders.
diff --git a/chrome/browser/views/html_dialog_view.cc b/chrome/browser/views/html_dialog_view.cc
index 76281f3..788bd1a 100644
--- a/chrome/browser/views/html_dialog_view.cc
+++ b/chrome/browser/views/html_dialog_view.cc
@@ -156,7 +156,8 @@ bool HtmlDialogView::IsPopup(TabContents* source) {
   return true;
 }
 
-void HtmlDialogView::ToolbarSizeChanged(TabContents* source, bool is_animating) {
+void HtmlDialogView::ToolbarSizeChanged(TabContents* source,
+                                        bool is_animating) {
   Layout();
 }
 
diff --git a/chrome/browser/views/options/languages_page_view.cc b/chrome/browser/views/options/languages_page_view.cc
index 5f9a5b8..9439f7d 100644
--- a/chrome/browser/views/options/languages_page_view.cc
+++ b/chrome/browser/views/options/languages_page_view.cc
@@ -233,8 +233,9 @@ static const int kDialogPadding = 7;
 static int kDefaultWindowWidthChars = 60;
 static int kDefaultWindowHeightLines = 3;
 
-AddLanguageWindowView::AddLanguageWindowView(LanguagesPageView* language_delegate,
-                                             Profile* profile)
+AddLanguageWindowView::AddLanguageWindowView(
+    LanguagesPageView* language_delegate,
+    Profile* profile)
     : profile_(profile->GetOriginalProfile()),
       language_delegate_(language_delegate),
       accept_language_combobox_(NULL) {
diff --git a/chrome/browser/views/options/options_group_view.cc b/chrome/browser/views/options/options_group_view.cc
index 80ed294..6ff1d14 100644
--- a/chrome/browser/views/options/options_group_view.cc
+++ b/chrome/browser/views/options/options_group_view.cc
@@ -40,7 +40,8 @@ OptionsGroupView::OptionsGroupView(views::View* contents,
       rb.GetFont(ResourceBundle::BaseFont).DeriveFont(0, ChromeFont::BOLD);
   title_label_->SetFont(title_font);
   SkColor title_color = gfx::NativeTheme::instance()->GetThemeColorWithDefault(
-      gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR, COLOR_WINDOWTEXT);
+      gfx::NativeTheme::BUTTON, BP_GROUPBOX, GBS_NORMAL, TMT_TEXTCOLOR,
+      COLOR_WINDOWTEXT);
   title_label_->SetColor(title_color);
   title_label_->SetMultiLine(true);
   title_label_->SetHorizontalAlignment(views::Label::ALIGN_LEFT);
diff --git a/chrome/browser/views/tabs/dragged_tab_controller.cc b/chrome/browser/views/tabs/dragged_tab_controller.cc
index e5e7cad..dbc8d4b 100644
--- a/chrome/browser/views/tabs/dragged_tab_controller.cc
+++ b/chrome/browser/views/tabs/dragged_tab_controller.cc
@@ -960,8 +960,8 @@ bool DraggedTabController::EndDragImpl(EndDragType type) {
   bool destroy_now = true;
   if (type != TAB_DESTROYED) {
     // We only finish up the drag if we were actually dragging. If we never
-    // constructed a view, the user just clicked and released and didn't move the
-    // mouse enough to trigger a drag.
+    // constructed a view, the user just clicked and released and didn't move
+    // the mouse enough to trigger a drag.
     if (view_.get()) {
       RestoreFocus();
       if (type == CANCELED) {
diff --git a/chrome/browser/views/theme_helpers.cc b/chrome/browser/views/theme_helpers.cc
index ba18603..d67d6d3 100644
--- a/chrome/browser/views/theme_helpers.cc
+++ b/chrome/browser/views/theme_helpers.cc
@@ -13,8 +13,10 @@
 #include "skia/ext/bitmap_platform_device_win.h"
 #include "SkGradientShader.h"
 
-void GetRebarGradientColors(int width, int x1, int x2, SkColor* c1, SkColor* c2) {
-  DCHECK(c1 && c2) << "ThemeHelpers::GetRebarGradientColors - c1 or c2 is NULL!";
+void GetRebarGradientColors(int width, int x1, int x2,
+                            SkColor* c1, SkColor* c2) {
+  DCHECK(c1 && c2) <<
+      "ThemeHelpers::GetRebarGradientColors - c1 or c2 is NULL!";
 
   // To get the colors we need, we draw a horizontal gradient using
   // DrawThemeBackground, then extract the pixel values from and return
@@ -63,7 +65,8 @@ void GetRebarGradientColors(int width, int x1, int x2, SkColor* c1, SkColor* c2)
   // The | in the following operations forces the alpha to 0xFF. This is
   // needed as windows sets the alpha to 0 when it renders.
   skia::BitmapPlatformDeviceWin& device =
-      static_cast<skia::BitmapPlatformDeviceWin&>(canvas.getTopPlatformDevice());
+      static_cast<skia::BitmapPlatformDeviceWin&>(
+          canvas.getTopPlatformDevice());
   *c1 = 0xFF000000 | device.getColorAt(x1, 0);
   *c2 = 0xFF000000 | device.getColorAt(x2, 0);
 }
diff --git a/chrome/browser/views/theme_helpers.h b/chrome/browser/views/theme_helpers.h
index 645aa97..979cf86 100644
--- a/chrome/browser/views/theme_helpers.h
+++ b/chrome/browser/views/theme_helpers.h
@@ -19,7 +19,8 @@
 // The width parameter is the width of horizontal gradient that will be
 // created to calculate the two colors. x1 and x2 are the two pixel positions
 // along the X axis.
-void GetRebarGradientColors(int width, int x1, int x2, SkColor* c1, SkColor* c2);
+void GetRebarGradientColors(int width, int x1, int x2,
+                            SkColor* c1, SkColor* c2);
 
 
 // Gets the color used to draw dark (inset beveled) lines.