summaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authortfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 16:35:35 +0000
committertfarina@chromium.org <tfarina@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-04-09 16:35:35 +0000
commit9061a69297986eb79f3bc667cb5f6b0ee3dcaf76 (patch)
tree8e19a86b0179eef33da27c36fb5e394d37ee6491 /ui
parent4a9d9d141df52bf69f54fb1540bcb06e4b3ad25c (diff)
downloadchromium_src-9061a69297986eb79f3bc667cb5f6b0ee3dcaf76.zip
chromium_src-9061a69297986eb79f3bc667cb5f6b0ee3dcaf76.tar.gz
chromium_src-9061a69297986eb79f3bc667cb5f6b0ee3dcaf76.tar.bz2
views/examples: Add enum parameter to ShowExamplesWindow() function.
This improves the readability of the code in the call sites of this function. R=sky@chromium.org Review URL: https://chromiumcodereview.appspot.com/10021020 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
-rw-r--r--ui/views/examples/examples_main.cc4
-rw-r--r--ui/views/examples/examples_window.cc12
-rw-r--r--ui/views/examples/examples_window.h7
3 files changed, 14 insertions, 9 deletions
diff --git a/ui/views/examples/examples_main.cc b/ui/views/examples/examples_main.cc
index cd48f6b..699f26f 100644
--- a/ui/views/examples/examples_main.cc
+++ b/ui/views/examples/examples_main.cc
@@ -24,8 +24,8 @@
#if defined(USE_AURA)
#include "ui/aura/client/stacking_client.h"
#include "ui/aura/env.h"
-#include "ui/aura/window.h"
#include "ui/aura/root_window.h"
+#include "ui/aura/window.h"
#include "ui/gfx/compositor/compositor.h"
#include "ui/gfx/compositor/test/compositor_test_support.h"
#include "ui/views/widget/native_widget_aura.h"
@@ -88,7 +88,7 @@ int main(int argc, char** argv) {
views::TestViewsDelegate delegate;
- views::examples::ShowExamplesWindow(true);
+ views::examples::ShowExamplesWindow(views::examples::QUIT_ON_CLOSE);
// xxx: Hax here because this kills event handling.
#if !defined(USE_AURA)
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index 17ba1a2..4d763e6 100644
--- a/ui/views/examples/examples_window.cc
+++ b/ui/views/examples/examples_window.cc
@@ -76,11 +76,11 @@ class ComboboxModelExampleList : public ui::ComboboxModel {
class ExamplesWindowContents : public WidgetDelegateView,
public ComboboxListener {
public:
- explicit ExamplesWindowContents(bool quit_on_close)
+ explicit ExamplesWindowContents(Operation operation)
: combobox_(new Combobox(&combobox_model_)),
example_shown_(new View),
status_label_(new Label),
- quit_on_close_(quit_on_close) {
+ operation_(operation) {
instance_ = this;
combobox_->set_listener(this);
}
@@ -103,7 +103,7 @@ class ExamplesWindowContents : public WidgetDelegateView,
virtual View* GetContentsView() OVERRIDE { return this; }
virtual void WindowClosing() OVERRIDE {
instance_ = NULL;
- if (quit_on_close_)
+ if (operation_ == QUIT_ON_CLOSE)
MessageLoopForUI::current()->Quit();
}
@@ -186,7 +186,7 @@ class ExamplesWindowContents : public WidgetDelegateView,
Combobox* combobox_;
View* example_shown_;
Label* status_label_;
- bool quit_on_close_;
+ const Operation operation_;
DISALLOW_COPY_AND_ASSIGN(ExamplesWindowContents);
};
@@ -194,11 +194,11 @@ class ExamplesWindowContents : public WidgetDelegateView,
// static
ExamplesWindowContents* ExamplesWindowContents::instance_ = NULL;
-void ShowExamplesWindow(bool quit_on_close) {
+void ShowExamplesWindow(Operation operation) {
if (ExamplesWindowContents::instance()) {
ExamplesWindowContents::instance()->GetWidget()->Activate();
} else {
- Widget::CreateWindowWithBounds(new ExamplesWindowContents(quit_on_close),
+ Widget::CreateWindowWithBounds(new ExamplesWindowContents(operation),
gfx::Rect(0, 0, 850, 300))->Show();
}
}
diff --git a/ui/views/examples/examples_window.h b/ui/views/examples/examples_window.h
index 7f3d2e6..33a6d6f 100644
--- a/ui/views/examples/examples_window.h
+++ b/ui/views/examples/examples_window.h
@@ -9,8 +9,13 @@
namespace views {
namespace examples {
+enum Operation {
+ DO_NOTHING_ON_CLOSE = 0,
+ QUIT_ON_CLOSE,
+};
+
// Shows a window with the views examples in it.
-void ShowExamplesWindow(bool quit_on_close);
+void ShowExamplesWindow(Operation operation);
} // namespace examples
} // namespace views