views/examples: Clean up cpplint warnings.

This was found by:
python ~/depot_tools/cpplint.py $(find ui/views/examples -type f \( -name "*.cc" -o -name "*.h" \) -print) 2>&1 | grep -v "Done processing"

Ignored further (redundant) warnings reported in content_client.

R=sky@chromium.org

Review URL: https://chromiumcodereview.appspot.com/10383034

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@135829 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 22 insertions, 19 deletions

diff --git a/ui/views/examples/button_example.cc b/ui/views/examples/button_example.cc
index fec2d1c..a86ee66 100644
--- a/ui/views/examples/button_example.cc
+++ b/ui/views/examples/button_example.cc
@@ -69,7 +69,7 @@ void ButtonExample::ButtonPressed(Button* sender, const Event& event) {
           text_button_->SetText(ASCIIToUTF16("Button"));
         }
       } else {
-        switch(text_button_->icon_placement()) {
+        switch (text_button_->icon_placement()) {
           case TextButton::ICON_ON_LEFT:
             text_button_->set_icon_placement(TextButton::ICON_ON_RIGHT);
             break;
@@ -84,7 +84,7 @@ void ButtonExample::ButtonPressed(Button* sender, const Event& event) {
       else
         text_button_->SetIcon(*icon_);
     } else {
-      switch(alignment_) {
+      switch (alignment_) {
         case TextButton::ALIGN_LEFT:
           alignment_ = TextButton::ALIGN_CENTER;
           break;
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.cc b/ui/views/examples/content_client/examples_browser_main_parts.cc
index 03c4be7..f350868 100644
--- a/ui/views/examples/content_client/examples_browser_main_parts.cc
+++ b/ui/views/examples/content_client/examples_browser_main_parts.cc
@@ -19,14 +19,14 @@
 #include "net/base/net_module.h"
 #include "ui/base/clipboard/clipboard.h"
 #include "ui/views/examples/examples_window.h"
-#include "ui/views/test/test_views_delegate.h"
 #include "ui/views/focus/accelerator_handler.h"
+#include "ui/views/test/test_views_delegate.h"
 
 #if defined(USE_AURA)
-#include "ui/aura/single_monitor_manager.h"
 #include "ui/aura/desktop/desktop_screen.h"
 #include "ui/aura/desktop/desktop_stacking_client.h"
 #include "ui/aura/env.h"
+#include "ui/aura/single_monitor_manager.h"
 #include "ui/gfx/screen.h"
 #include "ui/views/widget/desktop_native_widget_helper_aura.h"
 #include "ui/views/widget/native_widget_aura.h"
diff --git a/ui/views/examples/content_client/examples_main_delegate.cc b/ui/views/examples/content_client/examples_main_delegate.cc
index 2cf5cc4..c9c60ea 100644
--- a/ui/views/examples/content_client/examples_main_delegate.cc
+++ b/ui/views/examples/content_client/examples_main_delegate.cc
@@ -4,6 +4,8 @@
 
 #include "ui/views/examples/content_client/examples_main_delegate.h"
 
+#include <string>
+
 #include "base/command_line.h"
 #include "base/file_path.h"
 #include "base/logging.h"
@@ -44,7 +46,7 @@ int ExamplesBrowserMain(
   return exit_code;
 }
 
-}
+}  // namespace
 
 ExamplesMainDelegate::ExamplesMainDelegate() {
 }
diff --git a/ui/views/examples/content_client/examples_main_delegate.h b/ui/views/examples/content_client/examples_main_delegate.h
index 7945223..c3ada78 100644
--- a/ui/views/examples/content_client/examples_main_delegate.h
+++ b/ui/views/examples/content_client/examples_main_delegate.h
@@ -6,10 +6,13 @@
 #define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_MAIN_DELEGATE_H_
 #pragma once
 
+#include <string>
+
+#include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
-#include "content/shell/shell_content_client.h"
 #include "content/public/app/content_main_delegate.h"
+#include "content/shell/shell_content_client.h"
 
 namespace content {
 class ShellContentRendererClient;
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index b78bdd0..8e76efd 100644
--- a/ui/views/examples/examples_window.cc
+++ b/ui/views/examples/examples_window.cc
@@ -4,12 +4,9 @@
 
 #include "ui/views/examples/examples_window.h"
 
-#include "base/at_exit.h"
-#include "base/command_line.h"
-#include "base/i18n/icu_util.h"
+#include <string>
+
 #include "base/memory/scoped_vector.h"
-#include "base/process_util.h"
-#include "base/stl_util.h"
 #include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
 #include "ui/base/models/combobox_model.h"
diff --git a/ui/views/examples/native_theme_button_example.h b/ui/views/examples/native_theme_button_example.h
index 4ec4d2c..e77038e 100644
--- a/ui/views/examples/native_theme_button_example.h
+++ b/ui/views/examples/native_theme_button_example.h
@@ -6,6 +6,8 @@
 #define UI_VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
 #pragma once
 
+#include <string>
+
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "ui/gfx/native_theme.h"
diff --git a/ui/views/examples/progress_bar_example.cc b/ui/views/examples/progress_bar_example.cc
index 3a93bc5..223074f 100644
--- a/ui/views/examples/progress_bar_example.cc
+++ b/ui/views/examples/progress_bar_example.cc
@@ -1,9 +1,11 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/examples/progress_bar_example.h"
 
+#include <algorithm>
+
 #include "base/utf_string_conversions.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/controls/progress_bar.h"
diff --git a/ui/views/examples/tabbed_pane_example.h b/ui/views/examples/tabbed_pane_example.h
index a377352..1b9c96e 100644
--- a/ui/views/examples/tabbed_pane_example.h
+++ b/ui/views/examples/tabbed_pane_example.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
@@ -6,6 +6,8 @@
 #define UI_VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
 #pragma once
 
+#include <string>
+
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "ui/views/controls/button/text_button.h"
diff --git a/ui/views/examples/tree_view_example.cc b/ui/views/examples/tree_view_example.cc
index eba76e9..7ede122 100644
--- a/ui/views/examples/tree_view_example.cc
+++ b/ui/views/examples/tree_view_example.cc
@@ -8,7 +8,6 @@
 #include "ui/views/controls/menu/menu_model_adapter.h"
 #include "ui/views/controls/menu/menu_runner.h"
 #include "ui/views/controls/tree/tree_view.h"
-#include "ui/views/controls/tree/tree_view.h"
 #include "ui/views/layout/grid_layout.h"
 
 namespace views {
diff --git a/ui/views/examples/webview_example.cc b/ui/views/examples/webview_example.cc
index 79cd7ab..57e8012 100644
--- a/ui/views/examples/webview_example.cc
+++ b/ui/views/examples/webview_example.cc
@@ -4,13 +4,9 @@
 
 #include "ui/views/examples/webview_example.h"
 
-#include "base/utf_string_conversions.h"
 #include "content/public/browser/browser_context.h"
-#include "content/public/browser/navigation_controller.h"
-#include "grit/ui_resources.h"
-#include "ui/base/resource/resource_bundle.h"
-#include "ui/views/layout/fill_layout.h"
 #include "ui/views/controls/webview/webview.h"
+#include "ui/views/layout/fill_layout.h"
 
 namespace views {
 namespace examples {