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

Unified Diff: ui/views/examples/content_client/examples_browser_main_parts.cc

Issue 11962021: Revert 177182 - ViewTest.ChangeNativeViewHierarchyFindRoots failure (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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/views/examples/content_client/examples_browser_main_parts.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/views/examples/content_client/examples_browser_main_parts.cc
===================================================================
--- ui/views/examples/content_client/examples_browser_main_parts.cc (revision 177189)
+++ ui/views/examples/content_client/examples_browser_main_parts.cc (working copy)
@@ -22,6 +22,7 @@
#include "ui/aura/env.h"
#include "ui/gfx/screen.h"
#include "ui/views/widget/desktop_aura/desktop_screen.h"
+#include "ui/views/widget/desktop_aura/desktop_stacking_client.h"
#include "ui/views/widget/native_widget_aura.h"
#endif
@@ -39,6 +40,8 @@
browser_context_.reset(new content::ShellBrowserContext(false));
#if !defined(OS_CHROMEOS) && defined(USE_AURA)
+ stacking_client_.reset(new DesktopStackingClient);
+ aura::client::SetStackingClient(stacking_client_.get());
gfx::Screen::SetScreenInstance(
gfx::SCREEN_TYPE_NATIVE, CreateDesktopScreen());
#endif
@@ -51,6 +54,7 @@
browser_context_.reset();
views_delegate_.reset();
#if defined(USE_AURA)
+ stacking_client_.reset();
aura::Env::DeleteInstance();
#endif
}
« no previous file with comments | « ui/views/examples/content_client/examples_browser_main_parts.h ('k') | ui/views/views.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698