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

Unified Diff: ui/views/examples/double_split_view_example.cc

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/double_split_view_example.h ('k') | ui/views/examples/example_base.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/double_split_view_example.cc
===================================================================
--- ui/views/examples/double_split_view_example.cc (revision 111815)
+++ ui/views/examples/double_split_view_example.cc (working copy)
@@ -42,39 +42,41 @@
} // namespace
+namespace views {
namespace examples {
-DoubleSplitViewExample::DoubleSplitViewExample(ExamplesMain* main)
- : ExampleBase(main, "Double Split View") {
+DoubleSplitViewExample::DoubleSplitViewExample()
+ : ExampleBase("Double Split View") {
}
DoubleSplitViewExample::~DoubleSplitViewExample() {
}
-void DoubleSplitViewExample::CreateExampleView(views::View* container) {
+void DoubleSplitViewExample::CreateExampleView(View* container) {
SplittedView* splitted_view_1 = new SplittedView();
SplittedView* splitted_view_2 = new SplittedView();
SplittedView* splitted_view_3 = new SplittedView();
- inner_single_split_view_ = new views::SingleSplitView(
+ inner_single_split_view_ = new SingleSplitView(
splitted_view_1, splitted_view_2,
- views::SingleSplitView::HORIZONTAL_SPLIT,
+ SingleSplitView::HORIZONTAL_SPLIT,
NULL);
- outer_single_split_view_ = new views::SingleSplitView(
+ outer_single_split_view_ = new SingleSplitView(
inner_single_split_view_, splitted_view_3,
- views::SingleSplitView::HORIZONTAL_SPLIT,
+ SingleSplitView::HORIZONTAL_SPLIT,
NULL);
- views::GridLayout* layout = new views::GridLayout(container);
+ GridLayout* layout = new GridLayout(container);
container->SetLayoutManager(layout);
// Add scroll view.
- views::ColumnSet* column_set = layout->AddColumnSet(0);
- column_set->AddColumn(views::GridLayout::FILL, views::GridLayout::FILL, 1,
- views::GridLayout::USE_PREF, 0, 0);
+ ColumnSet* column_set = layout->AddColumnSet(0);
+ column_set->AddColumn(GridLayout::FILL, GridLayout::FILL, 1,
+ GridLayout::USE_PREF, 0, 0);
layout->StartRow(1, 0);
layout->AddView(outer_single_split_view_);
}
} // namespace examples
+} // namespace views
« no previous file with comments | « ui/views/examples/double_split_view_example.h ('k') | ui/views/examples/example_base.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698