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

Unified Diff: ui/views/examples/widget_example.h

Issue 11571023: Move ash/wm's DialogFrameView to ui/views/window; etc. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Remove redundant GetContentsView() OVERRIDEs; re-git-add dialog_frame_view files. Created 8 years 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
Index: ui/views/examples/widget_example.h
diff --git a/ui/views/examples/widget_example.h b/ui/views/examples/widget_example.h
index 88a8c4220d5dc7394939f07c08836dc2374e7032..cdeb1a47dc8f42166d54faf7b3d8b3a42ac520d4 100644
--- a/ui/views/examples/widget_example.h
+++ b/ui/views/examples/widget_example.h
@@ -9,7 +9,7 @@
#include "base/basictypes.h"
#include "base/compiler_specific.h"
-#include "ui/views/controls/button/text_button.h"
+#include "ui/views/controls/button/button.h"
#include "ui/views/examples/example_base.h"
#include "ui/views/widget/widget.h"
@@ -28,21 +28,14 @@ class WidgetExample : public ExampleBase, public ButtonListener {
private:
enum Command {
POPUP,
+ DIALOG,
CHILD,
- TRANSPARENT_POPUP,
- TRANSPARENT_CHILD,
CLOSE_WIDGET,
};
void BuildButton(View* container, const std::string& label, int tag);
- void InitWidget(Widget* widget, bool transparent);
-
-#if defined(OS_LINUX)
- void CreateChild(View* parent, bool transparent);
-#endif
-
- void CreatePopup(View* parent, bool transparent);
+ void ShowWidget(View* sender, Widget::InitParams params);
// Overridden from ButtonListener:
virtual void ButtonPressed(Button* sender, const ui::Event& event) OVERRIDE;

Powered by Google App Engine
This is Rietveld 408576698