summaryrefslogtreecommitdiffstats
path: root/ui/views/examples/radio_button_example.h
diff options
context:
space:
mode:
authorben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 16:34:05 +0000
committerben@chromium.org <ben@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-11-29 16:34:05 +0000
commited0b22ff3f9a1b5b190585dbdb8e9cd0d4742839 (patch)
treec4ce615f7fc3e3da612015ee553e2ee3a503e1ec /ui/views/examples/radio_button_example.h
parente86d8ba236502e2e5796bbbf7c8fcda512e51838 (diff)
downloadchromium_src-ed0b22ff3f9a1b5b190585dbdb8e9cd0d4742839.zip
chromium_src-ed0b22ff3f9a1b5b190585dbdb8e9cd0d4742839.tar.gz
chromium_src-ed0b22ff3f9a1b5b190585dbdb8e9cd0d4742839.tar.bz2
jGet the examples to run in aura_shell.
. Reorganizes views_examples target into two: views_examples_lib (a component) and views_examples_exe (a runner in views, which builds in Aura but does not run without crashing due to lack of desktop environment). . Refactors ExamplesMain into ExamplesWindowContents, a contents view that hosts the examples UI. Makes a publicly exported function from views examples to show a window containing this view. . Moves the examples into the views namespace. . Adds a button to launch the ExamplesWindow inside aura_shell. . Adds a NativeTabbedPaneViews to host the examples content. This is not a production class and is mostly just intended to get something onto the screen. The code is copy-pasta from NativeTabbedPaneWin. I imagine we can get rid of all of this once we stop using TabbedPanes in Chrome. http://crbug.com/105622 TEST=none Review URL: http://codereview.chromium.org/8687013 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@111954 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/views/examples/radio_button_example.h')
-rw-r--r--ui/views/examples/radio_button_example.h20
1 files changed, 10 insertions, 10 deletions
diff --git a/ui/views/examples/radio_button_example.h b/ui/views/examples/radio_button_example.h
index 8d9e072..79b83d6 100644
--- a/ui/views/examples/radio_button_example.h
+++ b/ui/views/examples/radio_button_example.h
@@ -17,28 +17,27 @@ namespace events {
class TextButton;
}
+namespace views {
namespace examples {
-class RadioButtonExample : public ExampleBase,
- public views::ButtonListener {
+class RadioButtonExample : public ExampleBase, public ButtonListener {
public:
- explicit RadioButtonExample(ExamplesMain* main);
+ RadioButtonExample();
virtual ~RadioButtonExample();
// Overridden from ExampleBase:
- virtual void CreateExampleView(views::View* container) OVERRIDE;
+ virtual void CreateExampleView(View* container) OVERRIDE;
private:
- // Overridden from views::ButtonListener:
- virtual void ButtonPressed(views::Button* sender,
- const views::Event& event) OVERRIDE;
+ // Overridden from ButtonListener:
+ virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE;
// Group of 3 radio buttons.
- views::RadioButton* radio_buttons_[3];
+ RadioButton* radio_buttons_[3];
// Control button to select radio buttons, and show the status of buttons.
- views::TextButton* select_;
- views::TextButton* status_;
+ TextButton* select_;
+ TextButton* status_;
// The number of times the button is pressed.
int count_;
@@ -47,5 +46,6 @@ class RadioButtonExample : public ExampleBase,
};
} // namespace examples
+} // namespace views
#endif // UI_VIEWS_EXAMPLES_RADIO_BUTTON_EXAMPLE_H_