Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(811)

Unified Diff: ui/views/examples/table_example.h

Issue 8687013: Get the examples to run in aura_shell. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 9 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ui/views/examples/table2_example.cc ('k') | ui/views/examples/table_example.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/table_example.h
===================================================================
--- ui/views/examples/table_example.h (revision 111815)
+++ ui/views/examples/table_example.h (working copy)
@@ -21,20 +21,19 @@
class Checkbox;
class Event;
class TableView;
-}
namespace examples {
class TableExample : public ExampleBase,
public ui::TableModel,
- public views::TableViewObserver,
- public views::ButtonListener {
+ public TableViewObserver,
+ public ButtonListener {
public:
- explicit TableExample(ExamplesMain* main);
+ TableExample();
virtual ~TableExample();
// ExampleBase:
- virtual void CreateExampleView(views::View* container) OVERRIDE;
+ virtual void CreateExampleView(View* container) OVERRIDE;
// ui::TableModel:
virtual int RowCount() OVERRIDE;
@@ -42,26 +41,25 @@
virtual SkBitmap GetIcon(int row) OVERRIDE;
virtual void SetObserver(ui::TableModelObserver* observer) OVERRIDE;
- // views::TableViewObserver:
+ // TableViewObserver:
virtual void OnSelectionChanged() OVERRIDE;
virtual void OnDoubleClick() OVERRIDE;
virtual void OnMiddleClick() OVERRIDE;
virtual void OnKeyDown(ui::KeyboardCode virtual_keycode) OVERRIDE;
- virtual void OnTableViewDelete(views::TableView* table_view) OVERRIDE;
- virtual void OnTableView2Delete(views::TableView2* table_view) OVERRIDE;
+ virtual void OnTableViewDelete(TableView* table_view) OVERRIDE;
+ virtual void OnTableView2Delete(TableView2* table_view) OVERRIDE;
- // views::ButtonListener:
- virtual void ButtonPressed(views::Button* sender,
- const views::Event& event) OVERRIDE;
+ // ButtonListener:
+ virtual void ButtonPressed(Button* sender, const Event& event) OVERRIDE;
private:
// The table to be tested.
- views::TableView* table_;
+ TableView* table_;
- views::Checkbox* column1_visible_checkbox_;
- views::Checkbox* column2_visible_checkbox_;
- views::Checkbox* column3_visible_checkbox_;
- views::Checkbox* column4_visible_checkbox_;
+ Checkbox* column1_visible_checkbox_;
+ Checkbox* column2_visible_checkbox_;
+ Checkbox* column3_visible_checkbox_;
+ Checkbox* column4_visible_checkbox_;
SkBitmap icon1_;
SkBitmap icon2_;
@@ -70,5 +68,6 @@
};
} // namespace examples
+} // namespace views
#endif // UI_VIEWS_EXAMPLES_TABLE_EXAMPLE_H_
« no previous file with comments | « ui/views/examples/table2_example.cc ('k') | ui/views/examples/table_example.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698