| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #include "ui/views/examples/examples_window.h" | 5 #include "ui/views/examples/examples_window.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 | 10 |
| (...skipping 29 matching lines...) Expand all Loading... |
| 40 #include "ui/views/examples/vector_example.h" | 40 #include "ui/views/examples/vector_example.h" |
| 41 #include "ui/views/examples/widget_example.h" | 41 #include "ui/views/examples/widget_example.h" |
| 42 #include "ui/views/layout/fill_layout.h" | 42 #include "ui/views/layout/fill_layout.h" |
| 43 #include "ui/views/layout/grid_layout.h" | 43 #include "ui/views/layout/grid_layout.h" |
| 44 #include "ui/views/widget/widget.h" | 44 #include "ui/views/widget/widget.h" |
| 45 #include "ui/views/widget/widget_delegate.h" | 45 #include "ui/views/widget/widget_delegate.h" |
| 46 | 46 |
| 47 namespace views { | 47 namespace views { |
| 48 namespace examples { | 48 namespace examples { |
| 49 | 49 |
| 50 typedef scoped_ptr<ScopedVector<ExampleBase> > ScopedExamples; | 50 typedef std::unique_ptr<ScopedVector<ExampleBase>> ScopedExamples; |
| 51 | 51 |
| 52 namespace { | 52 namespace { |
| 53 | 53 |
| 54 // Creates the default set of examples. Caller owns the result. | 54 // Creates the default set of examples. Caller owns the result. |
| 55 ScopedExamples CreateExamples() { | 55 ScopedExamples CreateExamples() { |
| 56 ScopedExamples examples(new ScopedVector<ExampleBase>); | 56 ScopedExamples examples(new ScopedVector<ExampleBase>); |
| 57 examples->push_back(new BubbleExample); | 57 examples->push_back(new BubbleExample); |
| 58 examples->push_back(new ButtonExample); | 58 examples->push_back(new ButtonExample); |
| 59 examples->push_back(new CheckboxExample); | 59 examples->push_back(new CheckboxExample); |
| 60 examples->push_back(new ComboboxExample); | 60 examples->push_back(new ComboboxExample); |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 231 widget->Show(); | 231 widget->Show(); |
| 232 } | 232 } |
| 233 } | 233 } |
| 234 | 234 |
| 235 void LogStatus(const std::string& string) { | 235 void LogStatus(const std::string& string) { |
| 236 ExamplesWindowContents::instance()->SetStatus(string); | 236 ExamplesWindowContents::instance()->SetStatus(string); |
| 237 } | 237 } |
| 238 | 238 |
| 239 } // namespace examples | 239 } // namespace examples |
| 240 } // namespace views | 240 } // namespace views |
| OLD | NEW |