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

Unified Diff: ui/oak/oak_window.cc

Issue 11801027: More work to make ash_unittests pass when we require context. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix TableViewTest by making it a ViewsTestBase. Created 7 years, 11 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
« no previous file with comments | « ui/oak/oak.h ('k') | ui/views/controls/table/table_view_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/oak/oak_window.cc
diff --git a/ui/oak/oak_window.cc b/ui/oak/oak_window.cc
index 7bcf20293a870ec0a6cfe20884aec1553eadba99..832a7a970845381da3207f22dd6557430088b19d 100644
--- a/ui/oak/oak_window.cc
+++ b/ui/oak/oak_window.cc
@@ -146,11 +146,14 @@ void OakWindow::Init() {
} // namespace internal
-void ShowOakWindow() {
+void ShowOakWindowWithContext(gfx::NativeView context) {
if (!internal::OakWindow::instance) {
+ // TODO(erg): Do we want to reuse this window in times with a different
+ // context? For now, this is OK, but if we ever use Oak outside of the ash
+ // shell, we run into crbug.com/165759.
internal::OakWindow::instance =
- views::Widget::CreateWindowWithBounds(new internal::OakWindow,
- gfx::Rect(10, 10, 500, 500));
+ views::Widget::CreateWindowWithContextAndBounds(
+ new internal::OakWindow, context, gfx::Rect(10, 10, 500, 500));
}
internal::OakWindow::instance->Show();
}
« no previous file with comments | « ui/oak/oak.h ('k') | ui/views/controls/table/table_view_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698