Skip to content

GitLab

T
tangled
Commit 75b98509 authored by tfarina@chromium.org's avatar tfarina@chromium.org
Browse files
Options

views: Move examples/ directory to ui/views/. 

BUG=104039
R=ben@chromium.org

Review URL: http://codereview.chromium.org/8555013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@110023 0039d316-1c4b-4281-b951-d872f2087c98
parent e5c49f5c
Hide whitespace changes
Inline Side-by-side
Showing with 193 additions and 195 deletions
views/examples/bubble_example.cc → ui/views/examples/bubble_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "views/bubble/bubble_delegate.h" #include "views/bubble/bubble_delegate.h"
......
views/examples/bubble_example.h → ui/views/examples/bubble_example.h
View file @ 75b98509
...@@ -2,17 +2,15 @@ ...@@ -2,17 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_
#define VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_
#pragma once #pragma once
#include "views/examples/example_base.h" #include "ui/views/examples/example_base.h"
#include "views/controls/button/button.h" #include "views/controls/button/button.h"
namespace examples { namespace examples {
struct BubbleConfig;
// A Bubble example. // A Bubble example.
class BubbleExample : public ExampleBase, class BubbleExample : public ExampleBase,
public views::ButtonListener { public views::ButtonListener {
...@@ -37,4 +35,4 @@ class BubbleExample : public ExampleBase, ...@@ -37,4 +35,4 @@ class BubbleExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_BUBBLE_EXAMPLE_H_
views/examples/button_example.cc → ui/views/examples/button_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "grit/ui_resources.h" #include "grit/ui_resources.h"
......
views/examples/button_example.h → ui/views/examples/button_example.h
View file @ 75b98509
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
#define VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
#pragma once #pragma once
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/text_button.h" #include "views/controls/button/text_button.h"
#include "views/examples/example_base.h"
namespace views { namespace views {
class View; class View;
...@@ -47,4 +47,4 @@ class ButtonExample : public ExampleBase, public views::ButtonListener { ...@@ -47,4 +47,4 @@ class ButtonExample : public ExampleBase, public views::ButtonListener {
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_BUTTON_EXAMPLE_H_
views/examples/combobox_example.cc → ui/views/examples/combobox_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "views/examples/combobox_example.h" #include "ui/views/examples/combobox_example.h"
#include "base/stringprintf.h" #include "base/stringprintf.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
......
views/examples/combobox_example.h → ui/views/examples/combobox_example.h
View file @ 75b98509
...@@ -2,13 +2,14 @@ ...@@ -2,13 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
#define VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
#pragma once #pragma once
#include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/combobox/combobox.h" #include "views/controls/combobox/combobox.h"
#include "views/examples/example_base.h"
#include "views/layout/fill_layout.h" #include "views/layout/fill_layout.h"
namespace examples { namespace examples {
...@@ -36,4 +37,4 @@ class ComboboxExample : public ExampleBase, ...@@ -36,4 +37,4 @@ class ComboboxExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_COMBOBOX_EXAMPLE_H_
views/examples/double_split_view_example.cc → ui/views/examples/double_split_view_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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/controls/single_split_view.h"
#include "views/layout/grid_layout.h" #include "views/layout/grid_layout.h"
......
views/examples/double_split_view_example.h → ui/views/examples/double_split_view_example.h
View file @ 75b98509
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
#define VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
#pragma once #pragma once
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "views/examples/example_base.h" #include "ui/views/examples/example_base.h"
namespace views { namespace views {
class SingleSplitView; class SingleSplitView;
...@@ -34,4 +34,4 @@ class DoubleSplitViewExample : public ExampleBase { ...@@ -34,4 +34,4 @@ class DoubleSplitViewExample : public ExampleBase {
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_DOUBLE_SPLIT_VIEW_EXAMPLE_H_
views/examples/example_base.cc → ui/views/examples/example_base.cc
View file @ 75b98509
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "views/examples/example_base.h" #include "ui/views/examples/example_base.h"
#include <stdarg.h> #include <stdarg.h>
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/stringprintf.h" #include "base/stringprintf.h"
#include "views/examples/examples_main.h" #include "ui/views/examples/examples_main.h"
namespace { namespace {
......
views/examples/example_base.h → ui/views/examples/example_base.h
View file @ 75b98509
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_EXAMPLE_BASE_H_ #ifndef UI_VIEWS_EXAMPLES_EXAMPLE_BASE_H_
#define VIEWS_EXAMPLES_EXAMPLE_BASE_H_ #define UI_VIEWS_EXAMPLES_EXAMPLE_BASE_H_
#pragma once #pragma once
#include <string> #include <string>
...@@ -56,4 +56,4 @@ class ExampleBase { ...@@ -56,4 +56,4 @@ class ExampleBase {
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_EXAMPLE_BASE_H_ #endif // UI_VIEWS_EXAMPLES_EXAMPLE_BASE_H_
views/examples/example_combobox_model.cc → ui/views/examples/example_combobox_model.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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/stringprintf.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
......
views/examples/example_combobox_model.h → ui/views/examples/example_combobox_model.h
View file @ 75b98509
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_ #ifndef UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
#define VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_ #define UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
#pragma once #pragma once
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
...@@ -29,4 +29,4 @@ class ExampleComboboxModel : public ui::ComboboxModel { ...@@ -29,4 +29,4 @@ class ExampleComboboxModel : public ui::ComboboxModel {
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_ #endif // UI_VIEWS_EXAMPLES_EXAMPLE_COMBOBOX_MODEL_H_
views/examples/examples_main.cc → ui/views/examples/examples_main.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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/at_exit.h"
#include "base/command_line.h" #include "base/command_line.h"
...@@ -12,29 +12,29 @@ ...@@ -12,29 +12,29 @@
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
#include "ui/base/ui_base_paths.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/button/text_button.h"
#include "views/controls/label.h" #include "views/controls/label.h"
#include "views/controls/tabbed_pane/tabbed_pane.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/focus/accelerator_handler.h"
#include "views/layout/grid_layout.h" #include "views/layout/grid_layout.h"
#include "views/test/test_views_delegate.h" #include "views/test/test_views_delegate.h"
...@@ -42,7 +42,7 @@ ...@@ -42,7 +42,7 @@
#if defined(OS_WIN) #if defined(OS_WIN)
// TableView is not yet ported to Linux. // TableView is not yet ported to Linux.
#include "views/examples/table_example.h" #include "ui/views/examples/table_example.h"
#endif #endif
namespace examples { namespace examples {
......
views/examples/link_example.cc → ui/views/examples/link_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "views/controls/link.h" #include "views/controls/link.h"
......
views/examples/link_example.h → ui/views/examples/link_example.h
View file @ 75b98509
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_LINK_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_LINK_EXAMPLE_H_
#define VIEWS_EXAMPLES_LINK_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_LINK_EXAMPLE_H_
#pragma once #pragma once
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/link_listener.h" #include "views/controls/link_listener.h"
#include "views/examples/example_base.h"
namespace views { namespace views {
class View; class View;
...@@ -37,4 +37,4 @@ class LinkExample : public ExampleBase, ...@@ -37,4 +37,4 @@ class LinkExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_LINK_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_LINK_EXAMPLE_H_
views/examples/menu_example.cc → ui/views/examples/menu_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "views/examples/menu_example.h" #include "ui/views/examples/menu_example.h"
#include <set> #include <set>
......
views/examples/menu_example.h → ui/views/examples/menu_example.h
View file @ 75b98509
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_MENU_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_MENU_EXAMPLE_H_
#define VIEWS_EXAMPLES_MENU_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_MENU_EXAMPLE_H_
#pragma once #pragma once
#include <string> #include <string>
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "views/examples/example_base.h" #include "ui/views/examples/example_base.h"
namespace examples { namespace examples {
...@@ -29,4 +29,4 @@ class MenuExample : public ExampleBase { ...@@ -29,4 +29,4 @@ class MenuExample : public ExampleBase {
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_MENU_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_MENU_EXAMPLE_H_
views/examples/message_box_example.cc → ui/views/examples/message_box_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "views/controls/message_box_view.h" #include "views/controls/message_box_view.h"
......
views/examples/message_box_example.h → ui/views/examples/message_box_example.h
View file @ 75b98509
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_
#define VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_
#pragma once #pragma once
#include <string> #include <string>
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/text_button.h" #include "views/controls/button/text_button.h"
#include "views/examples/example_base.h"
namespace views { namespace views {
class MessageBoxView; class MessageBoxView;
...@@ -47,4 +47,4 @@ class MessageBoxExample : public ExampleBase, ...@@ -47,4 +47,4 @@ class MessageBoxExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_MESSAGE_BOX_EXAMPLE_H_
views/examples/native_theme_button_example.cc → ui/views/examples/native_theme_button_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "views/examples/native_theme_button_example.h" #include "ui/views/examples/native_theme_button_example.h"
#include <string> #include <string>
...@@ -12,8 +12,8 @@ ...@@ -12,8 +12,8 @@
#include "ui/base/animation/throb_animation.h" #include "ui/base/animation/throb_animation.h"
#include "ui/base/models/combobox_model.h" #include "ui/base/models/combobox_model.h"
#include "ui/gfx/canvas.h" #include "ui/gfx/canvas.h"
#include "ui/views/examples/example_combobox_model.h"
#include "views/controls/label.h" #include "views/controls/label.h"
#include "views/examples/example_combobox_model.h"
#include "views/layout/grid_layout.h" #include "views/layout/grid_layout.h"
#include "views/native_theme_painter.h" #include "views/native_theme_painter.h"
......
views/examples/native_theme_button_example.h → ui/views/examples/native_theme_button_example.h
View file @ 75b98509
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
#define VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
#pragma once #pragma once
#include "base/basictypes.h" #include "base/basictypes.h"
#include "ui/gfx/native_theme.h" #include "ui/gfx/native_theme.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/custom_button.h" #include "views/controls/button/custom_button.h"
#include "views/controls/combobox/combobox.h" #include "views/controls/combobox/combobox.h"
#include "views/examples/example_base.h"
#include "views/native_theme_delegate.h" #include "views/native_theme_delegate.h"
#include "views/native_theme_painter.h" #include "views/native_theme_painter.h"
...@@ -90,4 +90,4 @@ class NativeThemeButtonExample : public ExampleBase, ...@@ -90,4 +90,4 @@ class NativeThemeButtonExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_NATIVE_THEME_BUTTON_EXAMPLE_H_
views/examples/native_theme_checkbox_example.cc → ui/views/examples/native_theme_checkbox_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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/stringprintf.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
......
views/examples/native_theme_checkbox_example.h → ui/views/examples/native_theme_checkbox_example.h
View file @ 75b98509
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_
#define VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_
#pragma once #pragma once
#include "base/basictypes.h" #include "base/basictypes.h"
#include "ui/gfx/native_theme.h" #include "ui/gfx/native_theme.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/button.h" #include "views/controls/button/button.h"
#include "views/examples/example_base.h"
namespace views { namespace views {
class Checkbox; class Checkbox;
...@@ -42,4 +42,4 @@ class NativeThemeCheckboxExample : public ExampleBase, ...@@ -42,4 +42,4 @@ class NativeThemeCheckboxExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_NATIVE_THEME_CHECKBOX_EXAMPLE_H_
views/examples/native_widget_views_example.cc → ui/views/examples/native_widget_views_example.cc
View file @ 75b98509
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "ui/gfx/canvas.h" #include "ui/gfx/canvas.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/text_button.h" #include "views/controls/button/text_button.h"
#include "views/examples/example_base.h"
#include "views/test/test_views_delegate.h" #include "views/test/test_views_delegate.h"
#include "views/view.h" #include "views/view.h"
#include "views/widget/native_widget_views.h" #include "views/widget/native_widget_views.h"
......
views/examples/native_widget_views_example.h → ui/views/examples/native_widget_views_example.h
View file @ 75b98509
...@@ -2,15 +2,13 @@ ...@@ -2,15 +2,13 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_
#define VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_
#pragma once #pragma once
#include <string>
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "views/examples/example_base.h" #include "ui/views/examples/example_base.h"
namespace examples { namespace examples {
...@@ -28,4 +26,4 @@ class NativeWidgetViewsExample : public ExampleBase { ...@@ -28,4 +26,4 @@ class NativeWidgetViewsExample : public ExampleBase {
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_NATIVE_WIDGET_VIEWS_EXAMPLE_H_
views/examples/progress_bar_example.cc → ui/views/examples/progress_bar_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "views/controls/button/text_button.h" #include "views/controls/button/text_button.h"
......
views/examples/progress_bar_example.h → ui/views/examples/progress_bar_example.h
View file @ 75b98509
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
#define VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
#pragma once #pragma once
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/button.h" #include "views/controls/button/button.h"
#include "views/examples/example_base.h"
namespace views { namespace views {
class ProgressBar; class ProgressBar;
...@@ -41,4 +41,4 @@ class ProgressBarExample : public ExampleBase, ...@@ -41,4 +41,4 @@ class ProgressBarExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_PROGRESS_BAR_EXAMPLE_H_
views/examples/radio_button_example.cc → ui/views/examples/radio_button_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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/stringprintf.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
......
views/examples/radio_button_example.h → ui/views/examples/radio_button_example.h
View file @ 75b98509
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_
#define VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_
#pragma once #pragma once
#include <string> #include <string>
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/radio_button.h" #include "views/controls/button/radio_button.h"
#include "views/examples/example_base.h"
namespace events { namespace events {
class TextButton; class TextButton;
...@@ -48,4 +48,4 @@ class RadioButtonExample : public ExampleBase, ...@@ -48,4 +48,4 @@ class RadioButtonExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_
views/examples/scroll_view_example.cc → ui/views/examples/scroll_view_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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/stringprintf.h"
#include "base/utf_string_conversions.h" #include "base/utf_string_conversions.h"
......
views/examples/scroll_view_example.h → ui/views/examples/scroll_view_example.h
View file @ 75b98509
...@@ -2,17 +2,17 @@ ...@@ -2,17 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
#define VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
#pragma once #pragma once
#include <string> #include <string>
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/text_button.h" #include "views/controls/button/text_button.h"
#include "views/controls/scroll_view.h" #include "views/controls/scroll_view.h"
#include "views/examples/example_base.h"
namespace examples { namespace examples {
...@@ -50,4 +50,4 @@ class ScrollViewExample : public ExampleBase, ...@@ -50,4 +50,4 @@ class ScrollViewExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_SCROLL_VIEW_EXAMPLE_H_
views/examples/single_split_view_example.cc → ui/views/examples/single_split_view_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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/controls/single_split_view.h"
#include "views/layout/grid_layout.h" #include "views/layout/grid_layout.h"
......
views/examples/single_split_view_example.h → ui/views/examples/single_split_view_example.h
View file @ 75b98509
...@@ -2,14 +2,14 @@ ...@@ -2,14 +2,14 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
#define VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
#pragma once #pragma once
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/single_split_view_listener.h" #include "views/controls/single_split_view_listener.h"
#include "views/examples/example_base.h"
namespace examples { namespace examples {
...@@ -32,4 +32,4 @@ class SingleSplitViewExample : public ExampleBase, ...@@ -32,4 +32,4 @@ class SingleSplitViewExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_SINGLE_SPLIT_VIEW_EXAMPLE_H_
views/examples/tabbed_pane_example.cc → ui/views/examples/tabbed_pane_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "views/controls/tabbed_pane/tabbed_pane.h" #include "views/controls/tabbed_pane/tabbed_pane.h"
......
views/examples/tabbed_pane_example.h → ui/views/examples/tabbed_pane_example.h
View file @ 75b98509
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
#define VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
#pragma once #pragma once
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/text_button.h" #include "views/controls/button/text_button.h"
#include "views/controls/tabbed_pane/tabbed_pane_listener.h" #include "views/controls/tabbed_pane/tabbed_pane_listener.h"
#include "views/examples/example_base.h"
namespace views { namespace views {
class TabbedPane; class TabbedPane;
...@@ -56,4 +56,4 @@ class TabbedPaneExample : public ExampleBase, ...@@ -56,4 +56,4 @@ class TabbedPaneExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_TABBED_PANE_EXAMPLE_H_
views/examples/table2_example.cc → ui/views/examples/table2_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "third_party/skia/include/core/SkCanvas.h" #include "third_party/skia/include/core/SkCanvas.h"
......
views/examples/table2_example.h → ui/views/examples/table2_example.h
View file @ 75b98509
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
#define VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
#pragma once #pragma once
#include <string> #include <string>
...@@ -12,9 +12,9 @@ ...@@ -12,9 +12,9 @@
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/models/table_model.h" #include "ui/base/models/table_model.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/button.h" #include "views/controls/button/button.h"
#include "views/controls/table/table_view_observer.h" #include "views/controls/table/table_view_observer.h"
#include "views/examples/example_base.h"
namespace views { namespace views {
class Checkbox; class Checkbox;
...@@ -70,4 +70,4 @@ class Table2Example : public ExampleBase, ...@@ -70,4 +70,4 @@ class Table2Example : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_TABLE2_EXAMPLE_H_
views/examples/table_example.cc → ui/views/examples/table_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#include "views/examples/table_example.h" #include "ui/views/examples/table_example.h"
#include <vector> #include <vector>
......
views/examples/table_example.h → ui/views/examples/table_example.h
View file @ 75b98509
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_TABLE_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_TABLE_EXAMPLE_H_
#define VIEWS_EXAMPLES_TABLE_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_TABLE_EXAMPLE_H_
#pragma once #pragma once
#include <string> #include <string>
...@@ -12,10 +12,10 @@ ...@@ -12,10 +12,10 @@
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "third_party/skia/include/core/SkBitmap.h" #include "third_party/skia/include/core/SkBitmap.h"
#include "ui/base/models/table_model.h" #include "ui/base/models/table_model.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/button.h" #include "views/controls/button/button.h"
#include "views/controls/table/table_view.h" #include "views/controls/table/table_view.h"
#include "views/controls/table/table_view_observer.h" #include "views/controls/table/table_view_observer.h"
#include "views/examples/example_base.h"
namespace views { namespace views {
class Checkbox; class Checkbox;
...@@ -71,4 +71,4 @@ class TableExample : public ExampleBase, ...@@ -71,4 +71,4 @@ class TableExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_TABLE_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_TABLE_EXAMPLE_H_
views/examples/text_example.cc → ui/views/examples/text_example.cc
View file @ 75b98509
// Copyright (c) 2011 The Chromium Authors. All rights reserved. // Copyright (c) 2011 The Chromium Authors. All rights reserved.
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "ui/base/resource/resource_bundle.h" #include "ui/base/resource/resource_bundle.h"
#include "ui/gfx/canvas.h" #include "ui/gfx/canvas.h"
#include "ui/gfx/canvas_skia.h" #include "ui/gfx/canvas_skia.h"
#include "ui/views/examples/example_combobox_model.h"
#include "views/controls/button/checkbox.h" #include "views/controls/button/checkbox.h"
#include "views/controls/label.h" #include "views/controls/label.h"
#include "views/examples/example_combobox_model.h"
#include "views/layout/grid_layout.h" #include "views/layout/grid_layout.h"
#include "views/view.h" #include "views/view.h"
......
views/examples/text_example.h → ui/views/examples/text_example.h
View file @ 75b98509
...@@ -2,15 +2,15 @@ ...@@ -2,15 +2,15 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_TEXT_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
#define VIEWS_EXAMPLES_TEXT_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
#pragma once #pragma once
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/button.h" #include "views/controls/button/button.h"
#include "views/controls/combobox/combobox.h" #include "views/controls/combobox/combobox.h"
#include "views/examples/example_base.h"
namespace views { namespace views {
class Checkbox; class Checkbox;
...@@ -76,4 +76,4 @@ class TextExample : public ExampleBase, ...@@ -76,4 +76,4 @@ class TextExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_TEXT_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_TEXT_EXAMPLE_H_
views/examples/textfield_example.cc → ui/views/examples/textfield_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "ui/base/range/range.h" #include "ui/base/range/range.h"
......
views/examples/textfield_example.h → ui/views/examples/textfield_example.h
View file @ 75b98509
...@@ -2,8 +2,8 @@ ...@@ -2,8 +2,8 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_
#define VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_
#pragma once #pragma once
#include <string> #include <string>
...@@ -11,9 +11,9 @@ ...@@ -11,9 +11,9 @@
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "base/string16.h" #include "base/string16.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/text_button.h" #include "views/controls/button/text_button.h"
#include "views/controls/textfield/textfield_controller.h" #include "views/controls/textfield/textfield_controller.h"
#include "views/examples/example_base.h"
namespace examples { namespace examples {
...@@ -55,4 +55,4 @@ class TextfieldExample : public ExampleBase, ...@@ -55,4 +55,4 @@ class TextfieldExample : public ExampleBase,
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_TEXTFIELD_EXAMPLE_H_
views/examples/throbber_example.cc → ui/views/examples/throbber_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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/controls/throbber.h"
#include "views/layout/fill_layout.h" #include "views/layout/fill_layout.h"
......
views/examples/throbber_example.h → ui/views/examples/throbber_example.h
View file @ 75b98509
...@@ -2,15 +2,17 @@ ...@@ -2,15 +2,17 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
#define VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
#pragma once #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 { namespace views {
class View; class View;
} // namespace views }
namespace examples { namespace examples {
...@@ -20,7 +22,7 @@ class ThrobberExample : public ExampleBase { ...@@ -20,7 +22,7 @@ class ThrobberExample : public ExampleBase {
virtual ~ThrobberExample(); virtual ~ThrobberExample();
// Overridden from ExampleBase: // Overridden from ExampleBase:
virtual void CreateExampleView(views::View* container); virtual void CreateExampleView(views::View* container) OVERRIDE;
private: private:
DISALLOW_COPY_AND_ASSIGN(ThrobberExample); DISALLOW_COPY_AND_ASSIGN(ThrobberExample);
...@@ -28,4 +30,4 @@ class ThrobberExample : public ExampleBase { ...@@ -28,4 +30,4 @@ class ThrobberExample : public ExampleBase {
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_THROBBER_EXAMPLE_H_
views/examples/widget_example.cc → ui/views/examples/widget_example.cc
View file @ 75b98509
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // 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 "base/utf_string_conversions.h"
#include "views/controls/button/text_button.h" #include "views/controls/button/text_button.h"
......
views/examples/widget_example.h → ui/views/examples/widget_example.h
View file @ 75b98509
...@@ -2,16 +2,16 @@ ...@@ -2,16 +2,16 @@
// Use of this source code is governed by a BSD-style license that can be // Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file. // found in the LICENSE file.
#ifndef VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_ #ifndef UI_VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_
#define VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_ #define UI_VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_
#pragma once #pragma once
#include <string> #include <string>
#include "base/basictypes.h" #include "base/basictypes.h"
#include "base/compiler_specific.h" #include "base/compiler_specific.h"
#include "ui/views/examples/example_base.h"
#include "views/controls/button/text_button.h" #include "views/controls/button/text_button.h"
#include "views/examples/example_base.h"
#include "views/widget/widget.h" #include "views/widget/widget.h"
namespace examples { namespace examples {
...@@ -53,4 +53,4 @@ class WidgetExample : public ExampleBase, public views::ButtonListener { ...@@ -53,4 +53,4 @@ class WidgetExample : public ExampleBase, public views::ButtonListener {
} // namespace examples } // namespace examples
#endif // VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_ #endif // UI_VIEWS_EXAMPLES_WIDGET_EXAMPLE_H_
views/views.gyp
View file @ 75b98509
...@@ -687,52 +687,52 @@ ...@@ -687,52 +687,52 @@
'..', '..',
], ],
'sources': [ 'sources': [
'examples/bubble_example.cc', '../ui/views/examples/bubble_example.cc',
'examples/bubble_example.h', '../ui/views/examples/bubble_example.h',
'examples/button_example.cc', '../ui/views/examples/button_example.cc',
'examples/button_example.h', '../ui/views/examples/button_example.h',
'examples/combobox_example.cc', '../ui/views/examples/combobox_example.cc',
'examples/combobox_example.h', '../ui/views/examples/combobox_example.h',
'examples/double_split_view_example.cc', '../ui/views/examples/double_split_view_example.cc',
'examples/double_split_view_example.h', '../ui/views/examples/double_split_view_example.h',
'examples/example_base.cc', '../ui/views/examples/example_base.cc',
'examples/example_base.h', '../ui/views/examples/example_base.h',
'examples/example_combobox_model.cc', '../ui/views/examples/example_combobox_model.cc',
'examples/example_combobox_model.h', '../ui/views/examples/example_combobox_model.h',
'examples/examples_main.cc', '../ui/views/examples/examples_main.cc',
'examples/examples_main.h', '../ui/views/examples/examples_main.h',
'examples/link_example.cc', '../ui/views/examples/link_example.cc',
'examples/link_example.h', '../ui/views/examples/link_example.h',
'examples/message_box_example.cc', '../ui/views/examples/message_box_example.cc',
'examples/message_box_example.h', '../ui/views/examples/message_box_example.h',
'examples/menu_example.cc', '../ui/views/examples/menu_example.cc',
'examples/menu_example.h', '../ui/views/examples/menu_example.h',
'examples/native_theme_button_example.cc', '../ui/views/examples/native_theme_button_example.cc',
'examples/native_theme_button_example.h', '../ui/views/examples/native_theme_button_example.h',
'examples/native_theme_checkbox_example.cc', '../ui/views/examples/native_theme_checkbox_example.cc',
'examples/native_theme_checkbox_example.h', '../ui/views/examples/native_theme_checkbox_example.h',
'examples/native_widget_views_example.cc', '../ui/views/examples/native_widget_views_example.cc',
'examples/native_widget_views_example.h', '../ui/views/examples/native_widget_views_example.h',
'examples/progress_bar_example.cc', '../ui/views/examples/progress_bar_example.cc',
'examples/progress_bar_example.h', '../ui/views/examples/progress_bar_example.h',
'examples/radio_button_example.cc', '../ui/views/examples/radio_button_example.cc',
'examples/radio_button_example.h', '../ui/views/examples/radio_button_example.h',
'examples/scroll_view_example.cc', '../ui/views/examples/scroll_view_example.cc',
'examples/scroll_view_example.h', '../ui/views/examples/scroll_view_example.h',
'examples/single_split_view_example.cc', '../ui/views/examples/single_split_view_example.cc',
'examples/single_split_view_example.h', '../ui/views/examples/single_split_view_example.h',
'examples/tabbed_pane_example.cc', '../ui/views/examples/tabbed_pane_example.cc',
'examples/tabbed_pane_example.h', '../ui/views/examples/tabbed_pane_example.h',
'examples/table2_example.cc', '../ui/views/examples/table2_example.cc',
'examples/table2_example.h', '../ui/views/examples/table2_example.h',
'examples/text_example.cc', '../ui/views/examples/text_example.cc',
'examples/text_example.h', '../ui/views/examples/text_example.h',
'examples/textfield_example.cc', '../ui/views/examples/textfield_example.cc',
'examples/textfield_example.h', '../ui/views/examples/textfield_example.h',
'examples/throbber_example.cc', '../ui/views/examples/throbber_example.cc',
'examples/throbber_example.h', '../ui/views/examples/throbber_example.h',
'examples/widget_example.cc', '../ui/views/examples/widget_example.cc',
'examples/widget_example.h', '../ui/views/examples/widget_example.h',
'test/test_views_delegate.cc', 'test/test_views_delegate.cc',
'test/test_views_delegate.h', 'test/test_views_delegate.h',
'<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc', '<(SHARED_INTERMEDIATE_DIR)/ui/gfx/gfx_resources.rc',
...@@ -765,12 +765,12 @@ ...@@ -765,12 +765,12 @@
], ],
'msvs_settings': { 'msvs_settings': {
'VCManifestTool': { 'VCManifestTool': {
'AdditionalManifestFiles': '$(ProjectDir)\\examples\\views_examples.exe.manifest', 'AdditionalManifestFiles': '..\\ui\\views\\examples\\views_examples.exe.manifest',
}, },
}, },
'sources': [ 'sources': [
'examples/table_example.cc', '../ui/views/examples/table_example.cc',
'examples/table_example.h', '../ui/views/examples/table_example.h',
], ],
}], }],
], ],
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment