views/examples: Cleanup: It is only necessary to include base/macros.h

base/basictypes.h was only for some hack around limitations of compiler
toolchain and stdint.h, now that it has been fixed, one can just include
base/macros.h, which already includes base/compiler_specific.h for
OVERRIDE, so we don't need to include it ourselves.

LOG(INFO) converted to VLOG(0) as per '[chromium-dev] Say no to excessive
debug logging' with the following command line:

$ sed -i -e 's/LOG(INFO)/VLOG(0)/g' $(git grep -l -F 'LOG(INFO)' -- 'ui/views/examples')

BUG=322805
TEST=views_examples_exe and views_examples_with_content_exe
TBR=ben@chromium.org

Review URL: https://codereview.chromium.org/143523010

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

35 files changed, 77 insertions, 101 deletions

diff --git a/ui/views/examples/bubble_example.h b/ui/views/examples/bubble_example.h
index 47e4bdd..a0e0e99 100644
--- a/ui/views/examples/bubble_example.h
+++ b/ui/views/examples/bubble_example.h
@@ -18,10 +18,11 @@ class VIEWS_EXAMPLES_EXPORT BubbleExample : public ExampleBase,
   BubbleExample();
   virtual ~BubbleExample();
 
-  // Overridden from ExampleBase.
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
+  // ButtonListener:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
 
   Button* no_shadow_;
diff --git a/ui/views/examples/button_example.h b/ui/views/examples/button_example.h
index 242f077..d195faa 100644
--- a/ui/views/examples/button_example.h
+++ b/ui/views/examples/button_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/text_button.h"
 #include "ui/views/examples/example_base.h"
 
@@ -24,14 +23,14 @@ class VIEWS_EXAMPLES_EXPORT ButtonExample : public ExampleBase,
   ButtonExample();
   virtual ~ButtonExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
   void TextButtonPressed(const ui::Event& event);
   void LabelButtonPressed(const ui::Event& event);
 
-  // Overridden from ButtonListener:
+  // ButtonListener:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
 
   // Example buttons.
diff --git a/ui/views/examples/checkbox_example.h b/ui/views/examples/checkbox_example.h
index b142abd..a5a8964 100644
--- a/ui/views/examples/checkbox_example.h
+++ b/ui/views/examples/checkbox_example.h
@@ -5,7 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_CHECKBOX_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_CHECKBOX_EXAMPLE_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/examples/example_base.h"
 
diff --git a/ui/views/examples/combobox_example.h b/ui/views/examples/combobox_example.h
index 8a10179..e015464 100644
--- a/ui/views/examples/combobox_example.h
+++ b/ui/views/examples/combobox_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
 #include "ui/views/examples/example_base.h"
@@ -20,7 +19,7 @@ class VIEWS_EXAMPLES_EXPORT ComboboxModelExample : public ui::ComboboxModel {
   ComboboxModelExample();
   virtual ~ComboboxModelExample();
 
-  // Overridden from ui::ComboboxModel:
+  // ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
   virtual base::string16 GetItemAt(int index) OVERRIDE;
 
@@ -34,11 +33,11 @@ class VIEWS_EXAMPLES_EXPORT ComboboxExample : public ExampleBase,
   ComboboxExample();
   virtual ~ComboboxExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
-  // Overridden from ComboboxListener:
+  // ComboboxListener:
   virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE;
 
   ComboboxModelExample combobox_model_;
diff --git a/ui/views/examples/content_client/examples_browser_main_parts.h b/ui/views/examples/content_client/examples_browser_main_parts.h
index 362fec8..0c929ad 100644
--- a/ui/views/examples/content_client/examples_browser_main_parts.h
+++ b/ui/views/examples/content_client/examples_browser_main_parts.h
@@ -5,7 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
 #define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_BROWSER_MAIN_PARTS_H_
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/browser_main_parts.h"
 
@@ -33,7 +33,7 @@ class ExamplesBrowserMainParts : public content::BrowserMainParts {
       const content::MainFunctionParams& parameters);
   virtual ~ExamplesBrowserMainParts();
 
-  // Overridden from content::BrowserMainParts:
+  // content::BrowserMainParts:
   virtual void ToolkitInitialized() OVERRIDE;
   virtual void PreMainMessageLoopRun() OVERRIDE;
   virtual bool MainMessageLoopRun(int* result_code) OVERRIDE;
diff --git a/ui/views/examples/content_client/examples_content_browser_client.h b/ui/views/examples/content_client/examples_content_browser_client.h
index b49d2c0..93a151d 100644
--- a/ui/views/examples/content_client/examples_content_browser_client.h
+++ b/ui/views/examples/content_client/examples_content_browser_client.h
@@ -5,10 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_CONTENT_BROWSER_CLIENT_H_
 #define UI_VIEWS_EXAMPLES_CONTENT_CLIENT_EXAMPLES_CONTENT_BROWSER_CLIENT_H_
 
-#include <string>
-
-#include "base/compiler_specific.h"
-#include "base/memory/scoped_ptr.h"
+#include "base/macros.h"
 #include "content/public/browser/content_browser_client.h"
 
 namespace content {
@@ -25,7 +22,7 @@ class ExamplesContentBrowserClient : public content::ContentBrowserClient {
   ExamplesContentBrowserClient();
   virtual ~ExamplesContentBrowserClient();
 
-  // Overridden from content::ContentBrowserClient:
+  // content::ContentBrowserClient:
   virtual content::BrowserMainParts* CreateBrowserMainParts(
       const content::MainFunctionParams& parameters) OVERRIDE;
   virtual net::URLRequestContextGetter* CreateRequestContext(
diff --git a/ui/views/examples/content_client/examples_main_delegate.h b/ui/views/examples/content_client/examples_main_delegate.h
index e8cb493..c52fd81 100644
--- a/ui/views/examples/content_client/examples_main_delegate.h
+++ b/ui/views/examples/content_client/examples_main_delegate.h
@@ -7,8 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_ptr.h"
 #include "content/public/app/content_main_delegate.h"
 #include "content/shell/common/shell_content_client.h"
diff --git a/ui/views/examples/double_split_view_example.cc b/ui/views/examples/double_split_view_example.cc
index fb1f099..90771d2 100644
--- a/ui/views/examples/double_split_view_example.cc
+++ b/ui/views/examples/double_split_view_example.cc
@@ -21,7 +21,7 @@ class SplittedView : public View {
 
   void SetColor(SkColor from, SkColor to);
 
-  // Overridden from View.
+  // View:
   virtual gfx::Size GetMinimumSize() OVERRIDE;
 
  private:
diff --git a/ui/views/examples/double_split_view_example.h b/ui/views/examples/double_split_view_example.h
index 06bfa01..fe37c79 100644
--- a/ui/views/examples/double_split_view_example.h
+++ b/ui/views/examples/double_split_view_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/examples/example_base.h"
 
 namespace views {
@@ -19,7 +18,7 @@ class VIEWS_EXAMPLES_EXPORT DoubleSplitViewExample : public ExampleBase {
   DoubleSplitViewExample();
   virtual ~DoubleSplitViewExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
diff --git a/ui/views/examples/example_base.cc b/ui/views/examples/example_base.cc
index 66a6c85..a06fc1d 100644
--- a/ui/views/examples/example_base.cc
+++ b/ui/views/examples/example_base.cc
@@ -6,7 +6,6 @@
 
 #include <stdarg.h>
 
-#include "base/compiler_specific.h"
 #include "base/strings/stringprintf.h"
 #include "ui/views/view.h"
 
@@ -28,7 +27,7 @@ class ContainerView : public View {
   }
 
  private:
-  // Overridden from View:
+  // View:
   virtual void ViewHierarchyChanged(
       const ViewHierarchyChangedDetails& details) OVERRIDE {
     View::ViewHierarchyChanged(details);
diff --git a/ui/views/examples/example_base.h b/ui/views/examples/example_base.h
index 3516dfa..f841eb9 100644
--- a/ui/views/examples/example_base.h
+++ b/ui/views/examples/example_base.h
@@ -7,7 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
+#include "base/macros.h"
 #include "ui/views/examples/views_examples_export.h"
 
 namespace views {
diff --git a/ui/views/examples/example_combobox_model.h b/ui/views/examples/example_combobox_model.h
index 2c5ee80..3b23332 100644
--- a/ui/views/examples/example_combobox_model.h
+++ b/ui/views/examples/example_combobox_model.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
 #define UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/base/models/combobox_model.h"
 
 namespace views {
@@ -17,7 +16,7 @@ class ExampleComboboxModel : public ui::ComboboxModel {
   ExampleComboboxModel(const char** strings, int count);
   virtual ~ExampleComboboxModel();
 
-  // Overridden from ui::ComboboxModel:
+  // ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE;
   virtual base::string16 GetItemAt(int index) OVERRIDE;
 
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index 9ec64a9..a7e51ce 100644
--- a/ui/views/examples/examples_window.cc
+++ b/ui/views/examples/examples_window.cc
@@ -104,7 +104,7 @@ class ComboboxModelExampleList : public ui::ComboboxModel {
     example_list_.swap(*examples);
   }
 
-  // Overridden from ui::ComboboxModel:
+  // ui::ComboboxModel:
   virtual int GetItemCount() const OVERRIDE { return example_list_.size(); }
   virtual base::string16 GetItemAt(int index) OVERRIDE {
     return base::UTF8ToUTF16(example_list_[index]->example_title());
@@ -170,7 +170,7 @@ class ExamplesWindowContents : public WidgetDelegateView,
   static ExamplesWindowContents* instance() { return instance_; }
 
  private:
-  // Overridden from WidgetDelegateView:
+  // WidgetDelegateView:
   virtual bool CanResize() const OVERRIDE { return true; }
   virtual bool CanMaximize() const OVERRIDE { return true; }
   virtual base::string16 GetWindowTitle() const OVERRIDE {
@@ -183,7 +183,7 @@ class ExamplesWindowContents : public WidgetDelegateView,
       base::MessageLoopForUI::current()->Quit();
   }
 
-  // Overridden from ComboboxListener:
+  // ComboboxListener:
   virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE {
     DCHECK_EQ(combobox, combobox_);
     DCHECK(combobox->selected_index() < combobox_model_.GetItemCount());
diff --git a/ui/views/examples/label_example.cc b/ui/views/examples/label_example.cc
index 9b4b6e2..fe7c8f0 100644
--- a/ui/views/examples/label_example.cc
+++ b/ui/views/examples/label_example.cc
@@ -24,7 +24,7 @@ class PreferredSizeLabel : public Label {
   PreferredSizeLabel();
   virtual ~PreferredSizeLabel();
 
-  // Overridden from Label:
+  // Label:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
 
  private:
diff --git a/ui/views/examples/label_example.h b/ui/views/examples/label_example.h
index 3b80f5d..8b7cfe7 100644
--- a/ui/views/examples/label_example.h
+++ b/ui/views/examples/label_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_LABEL_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_LABEL_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/examples/example_base.h"
 
 namespace views {
@@ -17,7 +16,7 @@ class VIEWS_EXAMPLES_EXPORT LabelExample : public ExampleBase {
   LabelExample();
   virtual ~LabelExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
diff --git a/ui/views/examples/link_example.h b/ui/views/examples/link_example.h
index 6ca5136..fd6e924 100644
--- a/ui/views/examples/link_example.h
+++ b/ui/views/examples/link_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_LINK_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_LINK_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/link_listener.h"
 #include "ui/views/examples/example_base.h"
 
@@ -19,11 +18,11 @@ class VIEWS_EXAMPLES_EXPORT LinkExample : public ExampleBase,
   LinkExample();
   virtual ~LinkExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
-  // Overridden from LinkListener:
+  // LinkListener:
   virtual void LinkClicked(Link* source, int event_flags) OVERRIDE;
 
   Link* link_;
diff --git a/ui/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc
index 6637253..bd9ea48 100644
--- a/ui/views/examples/menu_example.cc
+++ b/ui/views/examples/menu_example.cc
@@ -27,7 +27,7 @@ class ExampleMenuModel : public ui::SimpleMenuModel,
  public:
   ExampleMenuModel();
 
-  // Overridden from ui::SimpleMenuModel::Delegate:
+  // ui::SimpleMenuModel::Delegate:
   virtual bool IsCommandIdChecked(int command_id) const OVERRIDE;
   virtual bool IsCommandIdEnabled(int command_id) const OVERRIDE;
   virtual bool GetAcceleratorForCommandId(
@@ -64,7 +64,7 @@ class ExampleMenuButton : public MenuButton, public MenuButtonListener {
   virtual ~ExampleMenuButton();
 
  private:
-  // Overridden from MenuButtonListener:
+  // MenuButtonListener:
   virtual void OnMenuButtonClicked(View* source,
                                    const gfx::Point& point) OVERRIDE;
 
@@ -128,24 +128,24 @@ bool ExampleMenuModel::GetAcceleratorForCommandId(
 void ExampleMenuModel::ExecuteCommand(int command_id, int event_flags) {
   switch (command_id) {
     case COMMAND_DO_SOMETHING: {
-      LOG(INFO) << "Done something";
+      VLOG(0) << "Done something";
       break;
     }
 
     // Radio items.
     case COMMAND_SELECT_ASCII: {
       current_encoding_command_id_ = COMMAND_SELECT_ASCII;
-      LOG(INFO) << "Selected ASCII";
+      VLOG(0) << "Selected ASCII";
       break;
     }
     case COMMAND_SELECT_UTF8: {
       current_encoding_command_id_ = COMMAND_SELECT_UTF8;
-      LOG(INFO) << "Selected UTF-8";
+      VLOG(0) << "Selected UTF-8";
       break;
     }
     case COMMAND_SELECT_UTF16: {
       current_encoding_command_id_ = COMMAND_SELECT_UTF16;
-      LOG(INFO) << "Selected UTF-16";
+      VLOG(0) << "Selected UTF-16";
       break;
     }
 
diff --git a/ui/views/examples/menu_example.h b/ui/views/examples/menu_example.h
index 17daf1a..3ed5d37 100644
--- a/ui/views/examples/menu_example.h
+++ b/ui/views/examples/menu_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_MENU_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_MENU_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/examples/example_base.h"
 
 namespace views {
@@ -19,7 +18,7 @@ class VIEWS_EXAMPLES_EXPORT MenuExample : public ExampleBase {
   MenuExample();
   virtual ~MenuExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
diff --git a/ui/views/examples/message_box_example.h b/ui/views/examples/message_box_example.h
index a70facf..692ae22 100644
--- a/ui/views/examples/message_box_example.h
+++ b/ui/views/examples/message_box_example.h
@@ -7,8 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/examples/example_base.h"
 
@@ -24,11 +23,11 @@ class VIEWS_EXAMPLES_EXPORT MessageBoxExample : public ExampleBase,
   MessageBoxExample();
   virtual ~MessageBoxExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
-  // Overridden from ButtonListener:
+  // ButtonListener:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
 
   // The MessageBoxView to be tested.
diff --git a/ui/views/examples/multiline_example.cc b/ui/views/examples/multiline_example.cc
index 840d9f9..30dcd6a 100644
--- a/ui/views/examples/multiline_example.cc
+++ b/ui/views/examples/multiline_example.cc
@@ -9,6 +9,7 @@
 #include "ui/gfx/render_text.h"
 #include "ui/views/background.h"
 #include "ui/views/border.h"
+#include "ui/views/controls/button/checkbox.h"
 #include "ui/views/controls/label.h"
 #include "ui/views/controls/textfield/textfield.h"
 #include "ui/views/layout/grid_layout.h"
diff --git a/ui/views/examples/multiline_example.h b/ui/views/examples/multiline_example.h
index 351bef5..7231c66 100644
--- a/ui/views/examples/multiline_example.h
+++ b/ui/views/examples/multiline_example.h
@@ -5,14 +5,14 @@
 #ifndef UI_VIEWS_EXAMPLES_MULTILINE_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_MULTILINE_EXAMPLE_H_
 
-#include "base/compiler_specific.h"
-#include "base/strings/string16.h"
-#include "ui/views/controls/button/checkbox.h"
+#include "base/macros.h"
+#include "ui/views/controls/button/button.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/examples/example_base.h"
 
 namespace views {
 
+class Checkbox;
 class Label;
 
 namespace examples {
diff --git a/ui/views/examples/progress_bar_example.h b/ui/views/examples/progress_bar_example.h
index 8989356..8533b7a 100644
--- a/ui/views/examples/progress_bar_example.h
+++ b/ui/views/examples/progress_bar_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/examples/example_base.h"
 
@@ -21,11 +20,11 @@ class VIEWS_EXAMPLES_EXPORT ProgressBarExample : public ExampleBase,
   ProgressBarExample();
   virtual ~ProgressBarExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
-  // Overridden from ButtonListener:
+  // ButtonListener:
   virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE;
 
   Button* minus_button_;
diff --git a/ui/views/examples/radio_button_example.h b/ui/views/examples/radio_button_example.h
index d9fb885..cc14522 100644
--- a/ui/views/examples/radio_button_example.h
+++ b/ui/views/examples/radio_button_example.h
@@ -7,8 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/examples/example_base.h"
 
@@ -25,11 +24,11 @@ class VIEWS_EXAMPLES_EXPORT RadioButtonExample : public ExampleBase,
   RadioButtonExample();
   virtual ~RadioButtonExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
-  // Overridden from ButtonListener:
+  // ButtonListener:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
 
   // Group of 3 radio buttons.
diff --git a/ui/views/examples/scroll_view_example.h b/ui/views/examples/scroll_view_example.h
index 4606064..d850b01d 100644
--- a/ui/views/examples/scroll_view_example.h
+++ b/ui/views/examples/scroll_view_example.h
@@ -7,8 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/scroll_view.h"
 #include "ui/views/examples/example_base.h"
@@ -25,11 +24,11 @@ class VIEWS_EXAMPLES_EXPORT ScrollViewExample : public ExampleBase,
   ScrollViewExample();
   virtual ~ScrollViewExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
-  // Overridden from ButtonListener:
+  // ButtonListener:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
 
   // Control buttons to change the size of scrollable and jump to
diff --git a/ui/views/examples/single_split_view_example.cc b/ui/views/examples/single_split_view_example.cc
index 97fb36b..1258b05 100644
--- a/ui/views/examples/single_split_view_example.cc
+++ b/ui/views/examples/single_split_view_example.cc
@@ -21,7 +21,7 @@ class SplittedView : public View {
   void SetColor(SkColor from, SkColor to);
 
  private:
-  // Overridden from View:
+  // View:
   virtual gfx::Size GetPreferredSize() OVERRIDE;
   virtual gfx::Size GetMinimumSize() OVERRIDE;
   virtual void Layout() OVERRIDE;
diff --git a/ui/views/examples/single_split_view_example.h b/ui/views/examples/single_split_view_example.h
index 1b4be3d..603482c 100644
--- a/ui/views/examples/single_split_view_example.h
+++ b/ui/views/examples/single_split_view_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/single_split_view_listener.h"
 #include "ui/views/examples/example_base.h"
 
@@ -20,10 +19,11 @@ class VIEWS_EXAMPLES_EXPORT SingleSplitViewExample
   SingleSplitViewExample();
   virtual ~SingleSplitViewExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
+  // SingleSplitViewListener:
   virtual bool SplitHandleMoved(SingleSplitView* sender) OVERRIDE;
 
   SingleSplitView* single_split_view_;
diff --git a/ui/views/examples/slider_example.h b/ui/views/examples/slider_example.h
index 861dc83..32950f9 100644
--- a/ui/views/examples/slider_example.h
+++ b/ui/views/examples/slider_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_SLIDER_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_SLIDER_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/slider.h"
 #include "ui/views/examples/example_base.h"
 
@@ -21,11 +20,11 @@ class VIEWS_EXAMPLES_EXPORT SliderExample : public ExampleBase,
   SliderExample();
   virtual ~SliderExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
-  // Overridden from SliderListener:
+  // SliderListener:
   virtual void SliderValueChanged(Slider* sender,
                                   float value,
                                   float old_value,
diff --git a/ui/views/examples/tabbed_pane_example.h b/ui/views/examples/tabbed_pane_example.h
index 2d1b25b..f23f6b3 100644
--- a/ui/views/examples/tabbed_pane_example.h
+++ b/ui/views/examples/tabbed_pane_example.h
@@ -7,8 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/tabbed_pane/tabbed_pane_listener.h"
 #include "ui/views/examples/example_base.h"
diff --git a/ui/views/examples/table_example.h b/ui/views/examples/table_example.h
index 0e6c0db..06ac3c0 100644
--- a/ui/views/examples/table_example.h
+++ b/ui/views/examples/table_example.h
@@ -7,8 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/table_model.h"
 #include "ui/views/controls/button/button.h"
diff --git a/ui/views/examples/text_example.h b/ui/views/examples/text_example.h
index bcc876c..a8e3bc1 100644
--- a/ui/views/examples/text_example.h
+++ b/ui/views/examples/text_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "base/memory/scoped_vector.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/combobox/combobox_listener.h"
@@ -27,7 +26,7 @@ class VIEWS_EXAMPLES_EXPORT TextExample : public ExampleBase,
   TextExample();
   virtual ~TextExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
@@ -40,10 +39,10 @@ class VIEWS_EXAMPLES_EXPORT TextExample : public ExampleBase,
                         const char** strings,
                         int count);
 
-  // Overridden from ButtonListener:
+  // ButtonListener:
   virtual void ButtonPressed(Button* button, const ui::Event& event) OVERRIDE;
 
-  // Overridden from ComboboxListener:
+  // ComboboxListener:
   virtual void OnSelectedIndexChanged(Combobox* combobox) OVERRIDE;
 
   class TextExampleView;
diff --git a/ui/views/examples/textfield_example.h b/ui/views/examples/textfield_example.h
index 28f9bec..db5e199 100644
--- a/ui/views/examples/textfield_example.h
+++ b/ui/views/examples/textfield_example.h
@@ -7,9 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
-#include "base/strings/string16.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/controls/textfield/textfield_controller.h"
 #include "ui/views/examples/example_base.h"
diff --git a/ui/views/examples/throbber_example.h b/ui/views/examples/throbber_example.h
index 3a3b21e..3c4f9c0 100644
--- a/ui/views/examples/throbber_example.h
+++ b/ui/views/examples/throbber_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/examples/example_base.h"
 
 namespace views {
@@ -17,7 +16,7 @@ class VIEWS_EXAMPLES_EXPORT ThrobberExample : public ExampleBase {
   ThrobberExample();
   virtual ~ThrobberExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
diff --git a/ui/views/examples/tree_view_example.h b/ui/views/examples/tree_view_example.h
index d70e791..55af17f 100644
--- a/ui/views/examples/tree_view_example.h
+++ b/ui/views/examples/tree_view_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_TREE_VIEW_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_TREE_VIEW_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/base/models/simple_menu_model.h"
 #include "ui/base/models/tree_node_model.h"
 #include "ui/views/context_menu_controller.h"
diff --git a/ui/views/examples/webview_example.h b/ui/views/examples/webview_example.h
index bc4e459..3e35fe9 100644
--- a/ui/views/examples/webview_example.h
+++ b/ui/views/examples/webview_example.h
@@ -5,8 +5,7 @@
 #ifndef UI_VIEWS_EXAMPLES_WEBVIEW_EXAMPLE_H_
 #define UI_VIEWS_EXAMPLES_WEBVIEW_EXAMPLE_H_
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/examples/example_base.h"
 
 namespace content {
@@ -23,7 +22,7 @@ class WebViewExample : public ExampleBase {
   explicit WebViewExample(content::BrowserContext* browser_context);
   virtual ~WebViewExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
diff --git a/ui/views/examples/widget_example.h b/ui/views/examples/widget_example.h
index ab54b2e..ff08d70 100644
--- a/ui/views/examples/widget_example.h
+++ b/ui/views/examples/widget_example.h
@@ -7,8 +7,7 @@
 
 #include <string>
 
-#include "base/basictypes.h"
-#include "base/compiler_specific.h"
+#include "base/macros.h"
 #include "ui/views/controls/button/button.h"
 #include "ui/views/examples/example_base.h"
 #include "ui/views/widget/widget.h"
@@ -23,7 +22,7 @@ class VIEWS_EXAMPLES_EXPORT WidgetExample : public ExampleBase,
   WidgetExample();
   virtual ~WidgetExample();
 
-  // Overridden from ExampleBase:
+  // ExampleBase:
   virtual void CreateExampleView(View* container) OVERRIDE;
 
  private:
@@ -41,7 +40,7 @@ class VIEWS_EXAMPLES_EXPORT WidgetExample : public ExampleBase,
   // Construct a Widget for |sender|, initialize with |params|, and call Show().
   void ShowWidget(View* sender, Widget::InitParams params);
 
-  // Overridden from ButtonListener:
+  // ButtonListener:
   virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;
 
   DISALLOW_COPY_AND_ASSIGN(WidgetExample);