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

Unified Diff: ui/views/examples/examples_window.cc

Issue 2915223002: mash: Fix mash app shelf items; encapsulate ash property setup. (Closed)
Patch Set: Similar changes for other mash apps. Created 3 years, 7 months 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
« mash/task_viewer/task_viewer.cc ('K') | « ui/views/examples/examples_window.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/examples_window.cc
diff --git a/ui/views/examples/examples_window.cc b/ui/views/examples/examples_window.cc
index 5f869477c3e8beb5deaa04c7136ae4e6e62325ac..356a5315cd72da897e0fa4471b13fd514b391fb8 100644
--- a/ui/views/examples/examples_window.cc
+++ b/ui/views/examples/examples_window.cc
@@ -219,9 +219,9 @@ class ExamplesWindowContents : public WidgetDelegateView,
// static
ExamplesWindowContents* ExamplesWindowContents::instance_ = NULL;
-void ShowExamplesWindow(Operation operation,
- gfx::NativeWindow window_context,
- ExampleVector extra_examples) {
+Widget* ShowExamplesWindow(Operation operation,
+ gfx::NativeWindow window_context,
+ ExampleVector extra_examples) {
if (ExamplesWindowContents::instance()) {
ExamplesWindowContents::instance()->GetWidget()->Activate();
} else {
@@ -234,6 +234,7 @@ void ShowExamplesWindow(Operation operation,
widget->Init(params);
widget->Show();
}
+ return ExamplesWindowContents::instance()->GetWidget();
}
void LogStatus(const std::string& string) {
« mash/task_viewer/task_viewer.cc ('K') | « ui/views/examples/examples_window.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698