OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #include "ash/shell/content_client/shell_main_delegate.h" | 5 #include "ash/shell/content_client/shell_main_delegate.h" |
6 #include "content/public/app/content_main.h" | 6 #include "content/public/app/content_main.h" |
7 #include "sandbox/win/src/sandbox_types.h" | 7 #include "sandbox/win/src/sandbox_types.h" |
8 #include "ui/views/corewm/transient_window_stacking_client.h" | |
9 | 8 |
10 #if defined(OS_WIN) | 9 #if defined(OS_WIN) |
11 #include "content/public/app/startup_helper_win.h" | 10 #include "content/public/app/startup_helper_win.h" |
12 #endif | 11 #endif |
13 | 12 |
14 namespace { | |
15 | |
16 void CommonInit() { | |
17 // SetWindowStackingClient() takes ownership of TransientWindowStackingClient. | |
18 aura::client::SetWindowStackingClient( | |
19 new views::corewm::TransientWindowStackingClient); | |
20 } | |
21 | |
22 } // namespace | |
23 | |
24 #if defined(OS_WIN) | 13 #if defined(OS_WIN) |
25 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { | 14 int APIENTRY wWinMain(HINSTANCE instance, HINSTANCE, wchar_t*, int) { |
26 sandbox::SandboxInterfaceInfo sandbox_info = {0}; | 15 sandbox::SandboxInterfaceInfo sandbox_info = {0}; |
27 content::InitializeSandboxInfo(&sandbox_info); | 16 content::InitializeSandboxInfo(&sandbox_info); |
28 ash::shell::ShellMainDelegate delegate; | 17 ash::shell::ShellMainDelegate delegate; |
29 CommonInit(); | |
30 return content::ContentMain(instance, &sandbox_info, &delegate); | 18 return content::ContentMain(instance, &sandbox_info, &delegate); |
31 } | 19 } |
32 #else | 20 #else |
33 int main(int argc, const char** argv) { | 21 int main(int argc, const char** argv) { |
34 ash::shell::ShellMainDelegate delegate; | 22 ash::shell::ShellMainDelegate delegate; |
35 CommonInit(); | |
36 return content::ContentMain(argc, argv, &delegate); | 23 return content::ContentMain(argc, argv, &delegate); |
37 } | 24 } |
38 #endif | 25 #endif |
OLD | NEW |