MacViews: views_examples_with_content_exe working!

ui/views/test/child_modal_window.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ui/views/test/child_modal_window.h"
 
 #include "base/strings/utf_string_conversions.h"
 #include "ui/aura/window.h"
 #include "ui/gfx/canvas.h"
 #include "ui/views/background.h"
@@ skipping 103 matching lines @@
       textfield_(new Textfield),
       host_(new NativeViewHost),
       modal_parent_(NULL),
       child_(NULL) {
   Widget* widget = new Widget;
   Widget::InitParams params(Widget::InitParams::TYPE_CONTROL);
   params.context = context;
   widget->Init(params);
   widget->GetRootView()->set_background(
       Background::CreateSolidBackground(kModalParentColor));
-  modal_parent_ = widget->GetNativeView();
+  modal_parent_ = widget->GetNativeWindow();
+#if defined(USE_AURA)
   widget->GetNativeView()->SetName("ModalParent");
+#endif
   AddChildView(button_);
   AddChildView(textfield_);
   AddChildView(host_);
 }
 
 ChildModalParent::~ChildModalParent() {
 }
 
 void ChildModalParent::ShowChild() {
   if (!child_)
     child_ = CreateChild();
   child_->Show();
 }
 
 gfx::NativeWindow ChildModalParent::GetModalParent() const {
   return modal_parent_;
 }
 
 gfx::NativeWindow ChildModalParent::GetChild() const {
   if (child_)
-    return child_->GetNativeView();
+    return child_->GetNativeWindow();
   return NULL;
 }
 
 Widget* ChildModalParent::CreateChild() {
   Widget* child = Widget::CreateWindowWithParent(
       new ChildModalWindow, GetWidget()->GetNativeView());
+#if defined(USE_AURA)
   wm::SetModalParent(child->GetNativeView(), GetModalParent());
+  child->GetNativeView()->SetName("ChildModalWindow");
+#endif
   child->AddObserver(this);
-  child->GetNativeView()->SetName("ChildModalWindow");
   return child;
 }
 
 View* ChildModalParent::GetContentsView() {
   return this;
 }
 
 base::string16 ChildModalParent::GetWindowTitle() const {
   return base::ASCIIToUTF16("Examples: Child Modal Parent");
 }
@@ skipping 17 matching lines @@
   button_->SetBounds(x(), running_y, width(), kButtonHeight);
   running_y += kButtonHeight;
   textfield_->SetBounds(x(), running_y, width(), kTextfieldHeight);
   running_y += kTextfieldHeight;
   host_->SetBounds(x(), running_y, width(), height() - running_y);
 }
 
 void ChildModalParent::ViewHierarchyChanged(
     const ViewHierarchyChangedDetails& details) {
   if (details.is_add && details.child == this) {
+#if defined(USE_AURA)
     host_->Attach(modal_parent_);
     GetWidget()->GetNativeView()->SetName("Parent");
+#endif
   }
 }
 
 void ChildModalParent::ButtonPressed(Button* sender,
                                      const ui::Event& event) {
   if (sender == button_) {
     if (!child_)
       child_ = CreateChild();
     if (child_->IsVisible())
       child_->Hide();
     else
       child_->Show();
   }
 }
 
 void ChildModalParent::OnWidgetDestroying(Widget* widget) {
   if (child_) {
     DCHECK_EQ(child_, widget);
     child_ = NULL;
   }
 }
 
 }  // namespace test
 }  // namespace views