| Index: views/desktop/desktop_window.cc
|
| ===================================================================
|
| --- views/desktop/desktop_window.cc (revision 89890)
|
| +++ views/desktop/desktop_window.cc (working copy)
|
| @@ -109,11 +109,6 @@
|
| params.bounds = gfx::Rect(20, 20, 1920, 1200);
|
| window->Init(params);
|
| window->Show();
|
| -
|
| - desktop_window->CreateTestWindow(L"Sample Window 1", SK_ColorWHITE,
|
| - gfx::Rect(500, 200, 400, 400), true);
|
| - desktop_window->CreateTestWindow(L"Sample Window 2", SK_ColorRED,
|
| - gfx::Rect(600, 450, 450, 300), false);
|
| }
|
|
|
| void DesktopWindow::ActivateWidget(Widget* widget) {
|
| @@ -129,6 +124,25 @@
|
| }
|
| }
|
|
|
| +
|
| +void DesktopWindow::CreateTestWindow(const std::wstring& title,
|
| + SkColor color,
|
| + gfx::Rect initial_bounds,
|
| + bool rotate) {
|
| + views::Widget* window = views::Widget::CreateWindowWithBounds(
|
| + new TestWindowContentView(title, color),
|
| + initial_bounds);
|
| + window->Show();
|
| +
|
| + if (rotate) {
|
| + ui::Transform transform;
|
| + transform.SetRotate(90.0f);
|
| + transform.SetTranslateX(window->GetWindowScreenBounds().width());
|
| + static_cast<NativeWidgetViews*>(window->native_widget())->GetView()->
|
| + SetTransform(transform);
|
| + }
|
| +}
|
| +
|
| ////////////////////////////////////////////////////////////////////////////////
|
| // DesktopWindow, View overrides:
|
|
|
| @@ -170,26 +184,5 @@
|
| return this;
|
| }
|
|
|
| -////////////////////////////////////////////////////////////////////////////////
|
| -// DesktopWindow, private:
|
| -
|
| -void DesktopWindow::CreateTestWindow(const std::wstring& title,
|
| - SkColor color,
|
| - gfx::Rect initial_bounds,
|
| - bool rotate) {
|
| - views::Widget* window = views::Widget::CreateWindowWithBounds(
|
| - new TestWindowContentView(title, color),
|
| - initial_bounds);
|
| - window->Show();
|
| -
|
| - if (rotate) {
|
| - ui::Transform transform;
|
| - transform.SetRotate(90.0f);
|
| - transform.SetTranslateX(window->GetWindowScreenBounds().width());
|
| - static_cast<NativeWidgetViews*>(window->native_widget())->GetView()->
|
| - SetTransform(transform);
|
| - }
|
| -}
|
| -
|
| } // namespace desktop
|
| } // namespace views
|
|
|