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

Unified Diff: ui/views/examples/widget_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/widget_example.h ('k') | views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/widget_example.cc
===================================================================
--- ui/views/examples/widget_example.cc (revision 111815)
+++ ui/views/examples/widget_example.cc (working copy)
@@ -11,25 +11,27 @@
#include "ui/views/widget/widget.h"
#include "views/view.h"
+namespace views {
+namespace examples {
namespace {
// A layout manager that layouts a single child at
// the center of the host view.
-class CenterLayout : public views::LayoutManager {
+class CenterLayout : public LayoutManager {
public:
CenterLayout() {}
virtual ~CenterLayout() {}
// Overridden from LayoutManager:
- virtual void Layout(views::View* host) {
- views::View* child = host->child_at(0);
+ virtual void Layout(View* host) {
+ View* child = host->child_at(0);
gfx::Size size = child->GetPreferredSize();
child->SetBounds((host->width() - size.width()) / 2,
(host->height() - size.height()) / 2,
size.width(), size.height());
}
- virtual gfx::Size GetPreferredSize(views::View* host) {
+ virtual gfx::Size GetPreferredSize(View* host) {
return gfx::Size();
}
@@ -39,57 +41,54 @@
} // namespace
-namespace examples {
-
-WidgetExample::WidgetExample(ExamplesMain* main)
- : ExampleBase(main, "Widget") {
+WidgetExample::WidgetExample() : ExampleBase("Widget") {
}
WidgetExample::~WidgetExample() {
}
-void WidgetExample::CreateExampleView(views::View* container) {
+void WidgetExample::CreateExampleView(View* container) {
container->SetLayoutManager(
- new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 2));
+ new BoxLayout(BoxLayout::kHorizontal, 0, 0, 2));
BuildButton(container, "Create a popup widget", POPUP);
BuildButton(container, "Create a transparent popup widget",
TRANSPARENT_POPUP);
#if defined(OS_LINUX)
- views::View* vert_container = new views::View();
+ View* vert_container = new View();
container->AddChildView(vert_container);
vert_container->SetLayoutManager(
- new views::BoxLayout(views::BoxLayout::kVertical, 0, 0, 20));
+ new BoxLayout(BoxLayout::kVertical, 0, 0, 20));
BuildButton(vert_container, "Create a child widget", CHILD);
BuildButton(vert_container, "Create a transparent child widget",
TRANSPARENT_CHILD);
#endif
}
-void WidgetExample::BuildButton(views::View* container,
+void WidgetExample::BuildButton(View* container,
const std::string& label,
int tag) {
- views::TextButton* button = new views::TextButton(this, ASCIIToUTF16(label));
+ TextButton* button = new TextButton(this, ASCIIToUTF16(label));
button->set_tag(tag);
container->AddChildView(button);
}
-void WidgetExample::InitWidget(views::Widget* widget, bool transparent) {
+void WidgetExample::InitWidget(Widget* widget, bool transparent) {
// Add view/native buttons to close the popup widget.
- views::TextButton* close_button = new views::TextButton(
+ TextButton* close_button = new TextButton(
this, ASCIIToUTF16("Close"));
close_button->set_tag(CLOSE_WIDGET);
// TODO(oshima): support transparent native view.
- views::NativeTextButton* native_button = new views::NativeTextButton(
+ NativeTextButton* native_button = new NativeTextButton(
this, ASCIIToUTF16("Native Close"));
native_button->set_tag(CLOSE_WIDGET);
- views::View* button_container = new views::View();
+ View* button_container = new View();
button_container->SetLayoutManager(
- new views::BoxLayout(views::BoxLayout::kHorizontal, 0, 0, 1));
+ new BoxLayout(BoxLayout::kHorizontal, 0, 0, 1));
button_container->AddChildView(close_button);
button_container->AddChildView(native_button);
- views::View* widget_container = new views::View();
+ View* widget_container = new View();
widget_container->SetLayoutManager(new CenterLayout);
widget_container->AddChildView(button_container);
@@ -97,7 +96,7 @@
if (!transparent) {
widget_container->set_background(
- views::Background::CreateStandardPanelBackground());
+ Background::CreateStandardPanelBackground());
}
// Show the widget.
@@ -105,17 +104,17 @@
}
#if defined(OS_LINUX)
-void WidgetExample::CreateChild(views::View* parent, bool transparent) {
- views::Widget* widget = new views::Widget;
+void WidgetExample::CreateChild(View* parent, bool transparent) {
+ Widget* widget = new Widget;
// Compute where to place the child widget.
// We'll place it at the center of the root widget.
- views::Widget* parent_widget = parent->GetWidget();
+ Widget* parent_widget = parent->GetWidget();
gfx::Rect bounds = parent_widget->GetClientAreaScreenBounds();
// Child widget is 200x200 square.
bounds.SetRect((bounds.width() - 200) / 2, (bounds.height() - 200) / 2,
200, 200);
// Initialize the child widget with the computed bounds.
- views::Widget::InitParams params(views::Widget::InitParams::TYPE_CONTROL);
+ Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
params.transparent = transparent;
params.parent_widget = parent_widget;
widget->Init(params);
@@ -123,19 +122,19 @@
}
#endif
-void WidgetExample::CreatePopup(views::View* parent, bool transparent) {
- views::Widget* widget = new views::Widget;
+void WidgetExample::CreatePopup(View* parent, bool transparent) {
+ Widget* widget = new Widget;
// Compute where to place the popup widget.
// We'll place it right below the create button.
gfx::Point point = parent->GetMirroredPosition();
// The position in point is relative to the parent. Make it absolute.
- views::View::ConvertPointToScreen(parent, &point);
+ View::ConvertPointToScreen(parent, &point);
// Add the height of create_button_.
point.Offset(0, parent->size().height());
// Initialize the popup widget with the computed bounds.
- views::Widget::InitParams params(views::Widget::InitParams::TYPE_POPUP);
+ Widget::InitParams params(Widget::InitParams::TYPE_POPUP);
params.transparent = transparent;
params.parent_widget = parent->GetWidget();
params.bounds = gfx::Rect(point.x(), point.y(), 200, 300);
@@ -143,8 +142,7 @@
InitWidget(widget, transparent);
}
-void WidgetExample::ButtonPressed(views::Button* sender,
- const views::Event& event) {
+void WidgetExample::ButtonPressed(Button* sender, const Event& event) {
switch (sender->tag()) {
case POPUP:
CreatePopup(sender, false);
@@ -167,3 +165,4 @@
}
} // namespace examples
+} // namespace views
« no previous file with comments | « ui/views/examples/widget_example.h ('k') | views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698