From e8140cd33fca836f88e97c62368aaab551d30ee8 Mon Sep 17 00:00:00 2001
From: Eric Seidel <eseidel@chromium.org>
Date: Tue, 7 Apr 2015 11:17:26 -0700
Subject: [PATCH] Unbreak widgets_app.dart (by disabling PopupMenu for now)

Also fix button.dart to include ink_well.dart.

R=ojan@chromium.org

Review URL: https://codereview.chromium.org/1058013003
---
 examples/widgets/widgets_app.dart | 42 ++++++++++++++++++-------------
 framework/components/button.dart  |  1 +
 2 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/examples/widgets/widgets_app.dart b/examples/widgets/widgets_app.dart
index da349111664..33d39caaaf8 100644
--- a/examples/widgets/widgets_app.dart
+++ b/examples/widgets/widgets_app.dart
@@ -13,29 +13,35 @@ class WidgetsApp extends App {
     top: 200px;
     left: 200px;''');
 
+  PopupMenuController controller;
+
   UINode build() {
     return new Container(
       children: [
         new Button(key: 'Go', content: new Text('Go'), level: 1),
         new Button(key: 'Back', content: new Text('Back'), level: 3),
-        new Input(),
-        new Container(
-          style: _menuStyle,
-          children: [
-            new PopupMenu(
-              items: [
-                [new Text('People & options')],
-                [new Text('New group conversation')],
-                [new Text('Turn history off')],
-                [new Text('Archive')],
-                [new Text('Delete')],
-                [new Text('Un-merge SMS')],
-                [new Text('Help & feeback')],
-              ],
-              level: 4),
-            ]
-          )
-        ]
+        new Input()
+
+        // PopupMenu requires a PopupMenuController and should be wired up
+        // to a button to create the controller only when the menu is open, etc.
+        // new Container(
+        //   style: _menuStyle,
+        //   children: [
+        //     new PopupMenu(
+        //       controller: controller,
+        //       items: [
+        //         [new Text('People & options')],
+        //         [new Text('New group conversation')],
+        //         [new Text('Turn history off')],
+        //         [new Text('Archive')],
+        //         [new Text('Delete')],
+        //         [new Text('Un-merge SMS')],
+        //         [new Text('Help & feeback')],
+        //       ],
+        //       level: 4),
+        //     ]
+        //   )
+        // ]
       );
   }
 }
diff --git a/framework/components/button.dart b/framework/components/button.dart
index 0544107b85d..ccd7ffc1491 100644
--- a/framework/components/button.dart
+++ b/framework/components/button.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import '../fn.dart';
+import 'ink_well.dart';
 import 'material.dart';
 
 class Button extends Component {