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

Unified Diff: ash/shell/shell_main.cc

Issue 105813013: Adds views::corewm::WMState to install common state (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix viewseventtestbase Created 7 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
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.cc ('k') | ash/test/ash_test_helper.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ash/shell/shell_main.cc
diff --git a/ash/shell/shell_main.cc b/ash/shell/shell_main.cc
index b45ca5e9da3f9eddf4205fe798fa527b2afb4be2..3c477a415bedf041b4163b291b9bc0d542d09734 100644
--- a/ash/shell/shell_main.cc
+++ b/ash/shell/shell_main.cc
@@ -5,34 +5,21 @@
#include "ash/shell/content_client/shell_main_delegate.h"
#include "content/public/app/content_main.h"
#include "sandbox/win/src/sandbox_types.h"
-#include "ui/views/corewm/transient_window_stacking_client.h"
#if defined(OS_WIN)
#include "content/public/app/startup_helper_win.h"
#endif
-namespace {
-
-void CommonInit() {
- // SetWindowStackingClient() takes ownership of TransientWindowStackingClient.
- aura::client::SetWindowStackingClient(
- new views::corewm::TransientWindowStackingClient);
-}
-
-} // namespace
-
#if defined(OS_WIN)
int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) {
sandbox::SandboxInterfaceInfo sandbox_info = {0};
content::InitializeSandboxInfo(&sandbox_info);
ash::shell::ShellMainDelegate delegate;
- CommonInit();
return content::ContentMain(instance, &sandbox_info, &delegate);
}
#else
int main(int argc, const char** argv) {
ash::shell::ShellMainDelegate delegate;
- CommonInit();
return content::ContentMain(argc, argv, &delegate);
}
#endif
« no previous file with comments | « ash/shell/content_client/shell_browser_main_parts.cc ('k') | ash/test/ash_test_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698