50 files changed, 193 insertions, 195 deletions

diff --git a/views/examples/bubble_example.cc b/ui/views/examples/bubble_example.cc
index a5466c5..38a3529 100644
--- a/views/examples/bubble_example.cc
+++ b/ui/views/examples/bubble_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/bubble_example.h"
+#include "ui/views/examples/bubble_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "views/bubble/bubble_delegate.h"
diff --git a/views/examples/bubble_example.h b/ui/views/examples/bubble_example.h
index 65211ae..9c7e1c7 100644
--- a/views/examples/bubble_example.h
+++ b/ui/views/examples/bubble_example.h
@@ -2,17 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_
-#define VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_
 #pragma once
 
-#include "views/examples/example_base.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/button.h"
 
 namespace examples {
 
-struct BubbleConfig;
-
 // A Bubble example.
 class BubbleExample : public ExampleBase,
                       public views::ButtonListener {
@@ -37,4 +35,4 @@ class BubbleExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_
diff --git a/views/examples/button_example.cc b/ui/views/examples/button_example.cc
index eff17d9..f3f1c1f 100644
--- a/views/examples/button_example.cc
+++ b/ui/views/examples/button_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/button_example.h"
+#include "ui/views/examples/button_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "grit/ui_resources.h"
diff --git a/views/examples/button_example.h b/ui/views/examples/button_example.h
index f631dbc..b353105 100644
--- a/views/examples/button_example.h
+++ b/ui/views/examples/button_example.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
-#define VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/text_button.h"
-#include "views/examples/example_base.h"
 
 namespace views {
 class View;
@@ -47,4 +47,4 @@ class ButtonExample : public ExampleBase, public views::ButtonListener {
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
diff --git a/views/examples/combobox_example.cc b/ui/views/examples/combobox_example.cc
index a51cff9..c1053fc 100644
--- a/views/examples/combobox_example.cc
+++ b/ui/views/examples/combobox_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/combobox_example.h"
+#include "ui/views/examples/combobox_example.h"
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
diff --git a/views/examples/combobox_example.h b/ui/views/examples/combobox_example.h
index 0e50d6b..757fe3d 100644
--- a/views/examples/combobox_example.h
+++ b/ui/views/examples/combobox_example.h
@@ -2,13 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
-#define VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
 #pragma once
 
+#include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/combobox/combobox.h"
-#include "views/examples/example_base.h"
 #include "views/layout/fill_layout.h"
 
 namespace examples {
@@ -36,4 +37,4 @@ class ComboboxExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
diff --git a/views/examples/double_split_view_example.cc b/ui/views/examples/double_split_view_example.cc
index 0cd826c..bd7d756 100644
--- a/views/examples/double_split_view_example.cc
+++ b/ui/views/examples/double_split_view_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/double_split_view_example.h"
+#include "ui/views/examples/double_split_view_example.h"
 
 #include "views/controls/single_split_view.h"
 #include "views/layout/grid_layout.h"
diff --git a/views/examples/double_split_view_example.h b/ui/views/examples/double_split_view_example.h
index 0c151b6..709cff6 100644
--- a/views/examples/double_split_view_example.h
+++ b/ui/views/examples/double_split_view_example.h
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
-#define VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "views/examples/example_base.h"
+#include "ui/views/examples/example_base.h"
 
 namespace views {
 class SingleSplitView;
@@ -34,4 +34,4 @@ class DoubleSplitViewExample : public ExampleBase {
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
diff --git a/views/examples/example_base.cc b/ui/views/examples/example_base.cc
index 7a765bf..f4ced56 100644
--- a/views/examples/example_base.cc
+++ b/ui/views/examples/example_base.cc
@@ -2,13 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/example_base.h"
+#include "ui/views/examples/example_base.h"
 
 #include <stdarg.h>
 
 #include "base/compiler_specific.h"
 #include "base/stringprintf.h"
-#include "views/examples/examples_main.h"
+#include "ui/views/examples/examples_main.h"
 
 namespace {
 
diff --git a/views/examples/example_base.h b/ui/views/examples/example_base.h
index 9cd551b..7d49586 100644
--- a/views/examples/example_base.h
+++ b/ui/views/examples/example_base.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 VIEWS_EXAMPLES_EXAMPLE_BASE_H_
-#define VIEWS_EXAMPLES_EXAMPLE_BASE_H_
+#ifndef UI_VIEWS_EXAMPLES_EXAMPLE_BASE_H_
+#define UI_VIEWS_EXAMPLES_EXAMPLE_BASE_H_
 #pragma once
 
 #include <string>
@@ -56,4 +56,4 @@ class ExampleBase {
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_EXAMPLE_BASE_H_
+#endif  // UI_VIEWS_EXAMPLES_EXAMPLE_BASE_H_
diff --git a/views/examples/example_combobox_model.cc b/ui/views/examples/example_combobox_model.cc
index ec55093..f457291 100644
--- a/views/examples/example_combobox_model.cc
+++ b/ui/views/examples/example_combobox_model.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/example_combobox_model.h"
+#include "ui/views/examples/example_combobox_model.h"
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
diff --git a/views/examples/example_combobox_model.h b/ui/views/examples/example_combobox_model.h
index 281eada..1a7582a 100644
--- a/views/examples/example_combobox_model.h
+++ b/ui/views/examples/example_combobox_model.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 VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
-#define VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
+#ifndef UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
+#define UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
 #pragma once
 
 #include "base/compiler_specific.h"
@@ -29,4 +29,4 @@ class ExampleComboboxModel : public ui::ComboboxModel {
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
+#endif  // UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
diff --git a/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index 5b8adab..84a0b14 100644
--- a/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/examples_main.h"
+#include "ui/views/examples/examples_main.h"
 
 #include "base/at_exit.h"
 #include "base/command_line.h"
@@ -12,29 +12,29 @@
 #include "base/utf_string_conversions.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.h"
+#include "ui/views/examples/bubble_example.h"
+#include "ui/views/examples/button_example.h"
+#include "ui/views/examples/combobox_example.h"
+#include "ui/views/examples/double_split_view_example.h"
+#include "ui/views/examples/link_example.h"
+#include "ui/views/examples/menu_example.h"
+#include "ui/views/examples/message_box_example.h"
+#include "ui/views/examples/native_theme_button_example.h"
+#include "ui/views/examples/native_theme_checkbox_example.h"
+#include "ui/views/examples/native_widget_views_example.h"
+#include "ui/views/examples/progress_bar_example.h"
+#include "ui/views/examples/radio_button_example.h"
+#include "ui/views/examples/scroll_view_example.h"
+#include "ui/views/examples/single_split_view_example.h"
+#include "ui/views/examples/tabbed_pane_example.h"
+#include "ui/views/examples/table2_example.h"
+#include "ui/views/examples/text_example.h"
+#include "ui/views/examples/textfield_example.h"
+#include "ui/views/examples/throbber_example.h"
+#include "ui/views/examples/widget_example.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/label.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
-#include "views/examples/bubble_example.h"
-#include "views/examples/button_example.h"
-#include "views/examples/combobox_example.h"
-#include "views/examples/double_split_view_example.h"
-#include "views/examples/link_example.h"
-#include "views/examples/menu_example.h"
-#include "views/examples/message_box_example.h"
-#include "views/examples/native_theme_button_example.h"
-#include "views/examples/native_theme_checkbox_example.h"
-#include "views/examples/native_widget_views_example.h"
-#include "views/examples/progress_bar_example.h"
-#include "views/examples/radio_button_example.h"
-#include "views/examples/scroll_view_example.h"
-#include "views/examples/single_split_view_example.h"
-#include "views/examples/tabbed_pane_example.h"
-#include "views/examples/table2_example.h"
-#include "views/examples/text_example.h"
-#include "views/examples/textfield_example.h"
-#include "views/examples/throbber_example.h"
-#include "views/examples/widget_example.h"
 #include "views/focus/accelerator_handler.h"
 #include "views/layout/grid_layout.h"
 #include "views/test/test_views_delegate.h"
@@ -42,7 +42,7 @@
 
 #if defined(OS_WIN)
 // TableView is not yet ported to Linux.
-#include "views/examples/table_example.h"
+#include "ui/views/examples/table_example.h"
 #endif
 
 namespace examples {
diff --git a/views/examples/examples_main.h b/ui/views/examples/examples_main.h
index a4278937..a4278937 100644
--- a/views/examples/examples_main.h
+++ b/ui/views/examples/examples_main.h
diff --git a/views/examples/link_example.cc b/ui/views/examples/link_example.cc
index 0a503ea..7b81d88 100644
--- a/views/examples/link_example.cc
+++ b/ui/views/examples/link_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/link_example.h"
+#include "ui/views/examples/link_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "views/controls/link.h"
diff --git a/views/examples/link_example.h b/ui/views/examples/link_example.h
index 916b91a..38513f6 100644
--- a/views/examples/link_example.h
+++ b/ui/views/examples/link_example.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_LINK_EXAMPLE_H_
-#define VIEWS_EXAMPLES_LINK_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_LINK_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_LINK_EXAMPLE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/link_listener.h"
-#include "views/examples/example_base.h"
 
 namespace views {
 class View;
@@ -37,4 +37,4 @@ class LinkExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_LINK_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_LINK_EXAMPLE_H_
diff --git a/views/examples/menu_example.cc b/ui/views/examples/menu_example.cc
index a68b08a..15bfc0d 100644
--- a/views/examples/menu_example.cc
+++ b/ui/views/examples/menu_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/menu_example.h"
+#include "ui/views/examples/menu_example.h"
 
 #include <set>
 
diff --git a/views/examples/menu_example.h b/ui/views/examples/menu_example.h
index 27a93c8..9c7a640 100644
--- a/views/examples/menu_example.h
+++ b/ui/views/examples/menu_example.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_MENU_EXAMPLE_H_
-#define VIEWS_EXAMPLES_MENU_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_MENU_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_MENU_EXAMPLE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "views/examples/example_base.h"
+#include "ui/views/examples/example_base.h"
 
 namespace examples {
 
@@ -29,4 +29,4 @@ class MenuExample : public ExampleBase {
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_MENU_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_MENU_EXAMPLE_H_
diff --git a/views/examples/message_box_example.cc b/ui/views/examples/message_box_example.cc
index 8858f10..5da917f 100644
--- a/views/examples/message_box_example.cc
+++ b/ui/views/examples/message_box_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/message_box_example.h"
+#include "ui/views/examples/message_box_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "views/controls/message_box_view.h"
diff --git a/views/examples/message_box_example.h b/ui/views/examples/message_box_example.h
index d977869..cc45486 100644
--- a/views/examples/message_box_example.h
+++ b/ui/views/examples/message_box_example.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_
-#define VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/text_button.h"
-#include "views/examples/example_base.h"
 
 namespace views {
 class MessageBoxView;
@@ -47,4 +47,4 @@ class MessageBoxExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_
diff --git a/views/examples/native_theme_button_example.cc b/ui/views/examples/native_theme_button_example.cc
index 33b5b7d..e11bfcd 100644
--- a/views/examples/native_theme_button_example.cc
+++ b/ui/views/examples/native_theme_button_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/native_theme_button_example.h"
+#include "ui/views/examples/native_theme_button_example.h"
 
 #include <string>
 
@@ -12,8 +12,8 @@
 #include "ui/base/animation/throb_animation.h"
 #include "ui/base/models/combobox_model.h"
 #include "ui/gfx/canvas.h"
+#include "ui/views/examples/example_combobox_model.h"
 #include "views/controls/label.h"
-#include "views/examples/example_combobox_model.h"
 #include "views/layout/grid_layout.h"
 #include "views/native_theme_painter.h"
 
diff --git a/views/examples/native_theme_button_example.h b/ui/views/examples/native_theme_button_example.h
index 7fcf993..59f5e97 100644
--- a/views/examples/native_theme_button_example.h
+++ b/ui/views/examples/native_theme_button_example.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
-#define VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "ui/gfx/native_theme.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/custom_button.h"
 #include "views/controls/combobox/combobox.h"
-#include "views/examples/example_base.h"
 #include "views/native_theme_delegate.h"
 #include "views/native_theme_painter.h"
 
@@ -90,4 +90,4 @@ class NativeThemeButtonExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
diff --git a/views/examples/native_theme_checkbox_example.cc b/ui/views/examples/native_theme_checkbox_example.cc
index 3359a70..8c2bb55 100644
--- a/views/examples/native_theme_checkbox_example.cc
+++ b/ui/views/examples/native_theme_checkbox_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/native_theme_checkbox_example.h"
+#include "ui/views/examples/native_theme_checkbox_example.h"
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
diff --git a/views/examples/native_theme_checkbox_example.h b/ui/views/examples/native_theme_checkbox_example.h
index b0b5130..4ab6957 100644
--- a/views/examples/native_theme_checkbox_example.h
+++ b/ui/views/examples/native_theme_checkbox_example.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_
-#define VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "ui/gfx/native_theme.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/button.h"
-#include "views/examples/example_base.h"
 
 namespace views {
 class Checkbox;
@@ -42,4 +42,4 @@ class NativeThemeCheckboxExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_
diff --git a/views/examples/native_widget_views_example.cc b/ui/views/examples/native_widget_views_example.cc
index 11a2f2f..0e00035 100644
--- a/views/examples/native_widget_views_example.cc
+++ b/ui/views/examples/native_widget_views_example.cc
@@ -2,12 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/native_widget_views_example.h"
+#include "ui/views/examples/native_widget_views_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/gfx/canvas.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/text_button.h"
-#include "views/examples/example_base.h"
 #include "views/test/test_views_delegate.h"
 #include "views/view.h"
 #include "views/widget/native_widget_views.h"
diff --git a/views/examples/native_widget_views_example.h b/ui/views/examples/native_widget_views_example.h
index d5a2991..339016c 100644
--- a/views/examples/native_widget_views_example.h
+++ b/ui/views/examples/native_widget_views_example.h
@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_
-#define VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_
 #pragma once
 
-#include <string>
-
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
-#include "views/examples/example_base.h"
+#include "ui/views/examples/example_base.h"
 
 namespace examples {
 
@@ -28,4 +26,4 @@ class NativeWidgetViewsExample : public ExampleBase {
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_
diff --git a/views/examples/progress_bar_example.cc b/ui/views/examples/progress_bar_example.cc
index 91c73d6..5fabe7a 100644
--- a/views/examples/progress_bar_example.cc
+++ b/ui/views/examples/progress_bar_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/progress_bar_example.h"
+#include "ui/views/examples/progress_bar_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "views/controls/button/text_button.h"
diff --git a/views/examples/progress_bar_example.h b/ui/views/examples/progress_bar_example.h
index 1c30ea1..08724b2 100644
--- a/views/examples/progress_bar_example.h
+++ b/ui/views/examples/progress_bar_example.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
-#define VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/button.h"
-#include "views/examples/example_base.h"
 
 namespace views {
 class ProgressBar;
@@ -41,4 +41,4 @@ class ProgressBarExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
diff --git a/views/examples/radio_button_example.cc b/ui/views/examples/radio_button_example.cc
index b7d4a87..6450248 100644
--- a/views/examples/radio_button_example.cc
+++ b/ui/views/examples/radio_button_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/radio_button_example.h"
+#include "ui/views/examples/radio_button_example.h"
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
diff --git a/views/examples/radio_button_example.h b/ui/views/examples/radio_button_example.h
index 06754c1..44e59b1 100644
--- a/views/examples/radio_button_example.h
+++ b/ui/views/examples/radio_button_example.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_
-#define VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/radio_button.h"
-#include "views/examples/example_base.h"
 
 namespace events {
 class TextButton;
@@ -48,4 +48,4 @@ class RadioButtonExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_
diff --git a/views/examples/scroll_view_example.cc b/ui/views/examples/scroll_view_example.cc
index 7ed2ece..ddd9af9 100644
--- a/views/examples/scroll_view_example.cc
+++ b/ui/views/examples/scroll_view_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/scroll_view_example.h"
+#include "ui/views/examples/scroll_view_example.h"
 
 #include "base/stringprintf.h"
 #include "base/utf_string_conversions.h"
diff --git a/views/examples/scroll_view_example.h b/ui/views/examples/scroll_view_example.h
index 41f41b6..77d618a 100644
--- a/views/examples/scroll_view_example.h
+++ b/ui/views/examples/scroll_view_example.h
@@ -2,17 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
-#define VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/scroll_view.h"
-#include "views/examples/example_base.h"
 
 namespace examples {
 
@@ -50,4 +50,4 @@ class ScrollViewExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
diff --git a/views/examples/single_split_view_example.cc b/ui/views/examples/single_split_view_example.cc
index 46047c4..df57373 100644
--- a/views/examples/single_split_view_example.cc
+++ b/ui/views/examples/single_split_view_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/single_split_view_example.h"
+#include "ui/views/examples/single_split_view_example.h"
 
 #include "views/controls/single_split_view.h"
 #include "views/layout/grid_layout.h"
diff --git a/views/examples/single_split_view_example.h b/ui/views/examples/single_split_view_example.h
index 6f6e81f..6f70184 100644
--- a/views/examples/single_split_view_example.h
+++ b/ui/views/examples/single_split_view_example.h
@@ -2,14 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
-#define VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/single_split_view_listener.h"
-#include "views/examples/example_base.h"
 
 namespace examples {
 
@@ -32,4 +32,4 @@ class SingleSplitViewExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
diff --git a/views/examples/tabbed_pane_example.cc b/ui/views/examples/tabbed_pane_example.cc
index 18933f7..5016e53b 100644
--- a/views/examples/tabbed_pane_example.cc
+++ b/ui/views/examples/tabbed_pane_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/tabbed_pane_example.h"
+#include "ui/views/examples/tabbed_pane_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "views/controls/tabbed_pane/tabbed_pane.h"
diff --git a/views/examples/tabbed_pane_example.h b/ui/views/examples/tabbed_pane_example.h
index 0dd217d..1564ac6 100644
--- a/views/examples/tabbed_pane_example.h
+++ b/ui/views/examples/tabbed_pane_example.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
-#define VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/tabbed_pane/tabbed_pane_listener.h"
-#include "views/examples/example_base.h"
 
 namespace views {
 class TabbedPane;
@@ -56,4 +56,4 @@ class TabbedPaneExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
diff --git a/views/examples/table2_example.cc b/ui/views/examples/table2_example.cc
index 393fb7f..4ee46b8 100644
--- a/views/examples/table2_example.cc
+++ b/ui/views/examples/table2_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/table2_example.h"
+#include "ui/views/examples/table2_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "third_party/skia/include/core/SkCanvas.h"
diff --git a/views/examples/table2_example.h b/ui/views/examples/table2_example.h
index 19ffb4d..45ce2d4 100644
--- a/views/examples/table2_example.h
+++ b/ui/views/examples/table2_example.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 VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
-#define VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
 #pragma once
 
 #include <string>
@@ -12,9 +12,9 @@
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/table_model.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/button.h"
 #include "views/controls/table/table_view_observer.h"
-#include "views/examples/example_base.h"
 
 namespace views {
 class Checkbox;
@@ -70,4 +70,4 @@ class Table2Example : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
diff --git a/views/examples/table_example.cc b/ui/views/examples/table_example.cc
index f2287dc..06671d4 100644
--- a/views/examples/table_example.cc
+++ b/ui/views/examples/table_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/table_example.h"
+#include "ui/views/examples/table_example.h"
 
 #include <vector>
 
diff --git a/views/examples/table_example.h b/ui/views/examples/table_example.h
index 6074ee4..c5b535a 100644
--- a/views/examples/table_example.h
+++ b/ui/views/examples/table_example.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 VIEWS_EXAMPLES_TABLE_EXAMPLE_H_
-#define VIEWS_EXAMPLES_TABLE_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_TABLE_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_TABLE_EXAMPLE_H_
 #pragma once
 
 #include <string>
@@ -12,10 +12,10 @@
 #include "base/compiler_specific.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "ui/base/models/table_model.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/button.h"
 #include "views/controls/table/table_view.h"
 #include "views/controls/table/table_view_observer.h"
-#include "views/examples/example_base.h"
 
 namespace views {
 class Checkbox;
@@ -71,4 +71,4 @@ class TableExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_TABLE_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_TABLE_EXAMPLE_H_
diff --git a/views/examples/text_example.cc b/ui/views/examples/text_example.cc
index e48fdc0..3b7c82d 100644
--- a/views/examples/text_example.cc
+++ b/ui/views/examples/text_example.cc
@@ -1,17 +1,16 @@
-
 // Copyright (c) 2011 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 "views/examples/text_example.h"
+#include "ui/views/examples/text_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/gfx/canvas.h"
 #include "ui/gfx/canvas_skia.h"
+#include "ui/views/examples/example_combobox_model.h"
 #include "views/controls/button/checkbox.h"
 #include "views/controls/label.h"
-#include "views/examples/example_combobox_model.h"
 #include "views/layout/grid_layout.h"
 #include "views/view.h"
 
diff --git a/views/examples/text_example.h b/ui/views/examples/text_example.h
index 59569f8..fb8c4f0 100644
--- a/views/examples/text_example.h
+++ b/ui/views/examples/text_example.h
@@ -2,15 +2,15 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
-#define VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
 #pragma once
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/button.h"
 #include "views/controls/combobox/combobox.h"
-#include "views/examples/example_base.h"
 
 namespace views {
 class Checkbox;
@@ -76,4 +76,4 @@ class TextExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
diff --git a/views/examples/textfield_example.cc b/ui/views/examples/textfield_example.cc
index 3423d46..f9536e5 100644
--- a/views/examples/textfield_example.cc
+++ b/ui/views/examples/textfield_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/textfield_example.h"
+#include "ui/views/examples/textfield_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "ui/base/range/range.h"
diff --git a/views/examples/textfield_example.h b/ui/views/examples/textfield_example.h
index 86ae3d5..f3e1d74 100644
--- a/views/examples/textfield_example.h
+++ b/ui/views/examples/textfield_example.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 VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_
-#define VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_
 #pragma once
 
 #include <string>
@@ -11,9 +11,9 @@
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
 #include "base/string16.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/text_button.h"
 #include "views/controls/textfield/textfield_controller.h"
-#include "views/examples/example_base.h"
 
 namespace examples {
 
@@ -55,4 +55,4 @@ class TextfieldExample : public ExampleBase,
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_
diff --git a/views/examples/throbber_example.cc b/ui/views/examples/throbber_example.cc
index fb5d30d..dbba597 100644
--- a/views/examples/throbber_example.cc
+++ b/ui/views/examples/throbber_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/throbber_example.h"
+#include "ui/views/examples/throbber_example.h"
 
 #include "views/controls/throbber.h"
 #include "views/layout/fill_layout.h"
diff --git a/views/examples/throbber_example.h b/ui/views/examples/throbber_example.h
index 554fcdc2..82efd41 100644
--- a/views/examples/throbber_example.h
+++ b/ui/views/examples/throbber_example.h
@@ -2,15 +2,17 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
-#define VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
 #pragma once
 
-#include "views/examples/example_base.h"
+#include "base/basictypes.h"
+#include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 
 namespace views {
 class View;
-}  // namespace views
+}
 
 namespace examples {
 
@@ -20,7 +22,7 @@ class ThrobberExample : public ExampleBase {
   virtual ~ThrobberExample();
 
   // Overridden from ExampleBase:
-  virtual void CreateExampleView(views::View* container);
+  virtual void CreateExampleView(views::View* container) OVERRIDE;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ThrobberExample);
@@ -28,4 +30,4 @@ class ThrobberExample : public ExampleBase {
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
diff --git a/views/examples/views_examples.exe.manifest b/ui/views/examples/views_examples.exe.manifest
index 92f2e44..92f2e44 100644
--- a/views/examples/views_examples.exe.manifest
+++ b/ui/views/examples/views_examples.exe.manifest
diff --git a/views/examples/widget_example.cc b/ui/views/examples/widget_example.cc
index ed93ced..07844a0 100644
--- a/views/examples/widget_example.cc
+++ b/ui/views/examples/widget_example.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "views/examples/widget_example.h"
+#include "ui/views/examples/widget_example.h"
 
 #include "base/utf_string_conversions.h"
 #include "views/controls/button/text_button.h"
diff --git a/views/examples/widget_example.h b/ui/views/examples/widget_example.h
index 60ec575..ab802e3 100644
--- a/views/examples/widget_example.h
+++ b/ui/views/examples/widget_example.h
@@ -2,16 +2,16 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_
-#define VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_
+#ifndef UI_VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_
+#define UI_VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "ui/views/examples/example_base.h"
 #include "views/controls/button/text_button.h"
-#include "views/examples/example_base.h"
 #include "views/widget/widget.h"
 
 namespace examples {
@@ -53,4 +53,4 @@ class WidgetExample : public ExampleBase, public views::ButtonListener {
 
 }  // namespace examples
 
-#endif  // VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_
+#endif  // UI_VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_
diff --git a/views/views.gyp b/views/views.gyp
index 074fa7b..19b1e4a 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -687,52 +687,52 @@
         '..',
       ],
       'sources': [
-        'examples/bubble_example.cc',
-        'examples/bubble_example.h',
-        'examples/button_example.cc',
-        'examples/button_example.h',
-        'examples/combobox_example.cc',
-        'examples/combobox_example.h',
-        'examples/double_split_view_example.cc',
-        'examples/double_split_view_example.h',
-        'examples/example_base.cc',
-        'examples/example_base.h',
-        'examples/example_combobox_model.cc',
-        'examples/example_combobox_model.h',
-        'examples/examples_main.cc',
-        'examples/examples_main.h',
-        'examples/link_example.cc',
-        'examples/link_example.h',
-        'examples/message_box_example.cc',
-        'examples/message_box_example.h',
-        'examples/menu_example.cc',
-        'examples/menu_example.h',
-        'examples/native_theme_button_example.cc',
-        'examples/native_theme_button_example.h',
-        'examples/native_theme_checkbox_example.cc',
-        'examples/native_theme_checkbox_example.h',
-        'examples/native_widget_views_example.cc',
-        'examples/native_widget_views_example.h',
-        'examples/progress_bar_example.cc',
-        'examples/progress_bar_example.h',
-        'examples/radio_button_example.cc',
-        'examples/radio_button_example.h',
-        'examples/scroll_view_example.cc',
-        'examples/scroll_view_example.h',
-        'examples/single_split_view_example.cc',
-        'examples/single_split_view_example.h',
-        'examples/tabbed_pane_example.cc',
-        'examples/tabbed_pane_example.h',
-        'examples/table2_example.cc',
-        'examples/table2_example.h',
-        'examples/text_example.cc',
-        'examples/text_example.h',
-        'examples/textfield_example.cc',
-        'examples/textfield_example.h',
-        'examples/throbber_example.cc',
-        'examples/throbber_example.h',
-        'examples/widget_example.cc',
-        'examples/widget_example.h',
+        '../ui/views/examples/bubble_example.cc',
+        '../ui/views/examples/bubble_example.h',
+        '../ui/views/examples/button_example.cc',
+        '../ui/views/examples/button_example.h',
+        '../ui/views/examples/combobox_example.cc',
+        '../ui/views/examples/combobox_example.h',
+        '../ui/views/examples/double_split_view_example.cc',
+        '../ui/views/examples/double_split_view_example.h',
+        '../ui/views/examples/example_base.cc',
+        '../ui/views/examples/example_base.h',
+        '../ui/views/examples/example_combobox_model.cc',
+        '../ui/views/examples/example_combobox_model.h',
+        '../ui/views/examples/examples_main.cc',
+        '../ui/views/examples/examples_main.h',
+        '../ui/views/examples/link_example.cc',
+        '../ui/views/examples/link_example.h',
+        '../ui/views/examples/message_box_example.cc',
+        '../ui/views/examples/message_box_example.h',
+        '../ui/views/examples/menu_example.cc',
+        '../ui/views/examples/menu_example.h',
+        '../ui/views/examples/native_theme_button_example.cc',
+        '../ui/views/examples/native_theme_button_example.h',
+        '../ui/views/examples/native_theme_checkbox_example.cc',
+        '../ui/views/examples/native_theme_checkbox_example.h',
+        '../ui/views/examples/native_widget_views_example.cc',
+        '../ui/views/examples/native_widget_views_example.h',
+        '../ui/views/examples/progress_bar_example.cc',
+        '../ui/views/examples/progress_bar_example.h',
+        '../ui/views/examples/radio_button_example.cc',
+        '../ui/views/examples/radio_button_example.h',
+        '../ui/views/examples/scroll_view_example.cc',
+        '../ui/views/examples/scroll_view_example.h',
+        '../ui/views/examples/single_split_view_example.cc',
+        '../ui/views/examples/single_split_view_example.h',
+        '../ui/views/examples/tabbed_pane_example.cc',
+        '../ui/views/examples/tabbed_pane_example.h',
+        '../ui/views/examples/table2_example.cc',
+        '../ui/views/examples/table2_example.h',
+        '../ui/views/examples/text_example.cc',
+        '../ui/views/examples/text_example.h',
+        '../ui/views/examples/textfield_example.cc',
+        '../ui/views/examples/textfield_example.h',
+        '../ui/views/examples/throbber_example.cc',
+        '../ui/views/examples/throbber_example.h',
+        '../ui/views/examples/widget_example.cc',
+        '../ui/views/examples/widget_example.h',
         'test/test_views_delegate.cc',
         'test/test_views_delegate.h',
         '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
@@ -765,12 +765,12 @@
           ],
           'msvs_settings': {
             'VCManifestTool': {
-              'AdditionalManifestFiles': '$(ProjectDir)\\examples\\views_examples.exe.manifest',
+              'AdditionalManifestFiles': '..\\ui\\views\\examples\\views_examples.exe.manifest',
             },
           },
           'sources': [
-            'examples/table_example.cc',
-            'examples/table_example.h',
+            '../ui/views/examples/table_example.cc',
+            '../ui/views/examples/table_example.h',
           ],
         }],
       ],