| OLD | NEW |
| 1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "ui/views_content_client/views_content_client.h" | 5 #include "ui/views_content_client/views_content_client.h" |
| 6 | 6 |
| 7 #include "build/build_config.h" |
| 7 #include "content/public/app/content_main.h" | 8 #include "content/public/app/content_main.h" |
| 8 #include "ui/views_content_client/views_content_main_delegate.h" | 9 #include "ui/views_content_client/views_content_main_delegate.h" |
| 9 | 10 |
| 10 namespace ui { | 11 namespace ui { |
| 11 | 12 |
| 12 #if defined(OS_WIN) | 13 #if defined(OS_WIN) |
| 13 ViewsContentClient::ViewsContentClient( | 14 ViewsContentClient::ViewsContentClient( |
| 14 HINSTANCE instance, sandbox::SandboxInterfaceInfo* sandbox_info) | 15 HINSTANCE instance, sandbox::SandboxInterfaceInfo* sandbox_info) |
| 15 : instance_(instance), sandbox_info_(sandbox_info) { | 16 : instance_(instance), sandbox_info_(sandbox_info) { |
| 16 } | 17 } |
| (...skipping 15 matching lines...) Expand all Loading... |
| 32 params.sandbox_info = sandbox_info_; | 33 params.sandbox_info = sandbox_info_; |
| 33 #else | 34 #else |
| 34 params.argc = argc_; | 35 params.argc = argc_; |
| 35 params.argv = argv_; | 36 params.argv = argv_; |
| 36 #endif | 37 #endif |
| 37 | 38 |
| 38 return content::ContentMain(params); | 39 return content::ContentMain(params); |
| 39 } | 40 } |
| 40 | 41 |
| 41 } // namespace ui | 42 } // namespace ui |
| OLD | NEW |