| 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 "base/bind.h" | 5 #include "base/bind.h" |
| 6 #include "build/build_config.h" |
| 6 #include "content/public/browser/browser_context.h" | 7 #include "content/public/browser/browser_context.h" |
| 7 #include "ui/views/examples/examples_window_with_content.h" | 8 #include "ui/views/examples/examples_window_with_content.h" |
| 8 #include "ui/views_content_client/views_content_client.h" | 9 #include "ui/views_content_client/views_content_client.h" |
| 9 | 10 |
| 10 #if defined(OS_WIN) | 11 #if defined(OS_WIN) |
| 11 #include "content/public/app/sandbox_helper_win.h" | 12 #include "content/public/app/sandbox_helper_win.h" |
| 12 #include "sandbox/win/src/sandbox_types.h" | 13 #include "sandbox/win/src/sandbox_types.h" |
| 13 #endif | 14 #endif |
| 14 | 15 |
| 15 namespace { | 16 namespace { |
| (...skipping 24 matching lines...) Expand all Loading... |
| 40 content::InitializeSandboxInfo(&sandbox_info); | 41 content::InitializeSandboxInfo(&sandbox_info); |
| 41 ui::ViewsContentClient views_content_client(instance, &sandbox_info); | 42 ui::ViewsContentClient views_content_client(instance, &sandbox_info); |
| 42 #else | 43 #else |
| 43 int main(int argc, const char** argv) { | 44 int main(int argc, const char** argv) { |
| 44 ui::ViewsContentClient views_content_client(argc, argv); | 45 ui::ViewsContentClient views_content_client(argc, argv); |
| 45 #endif | 46 #endif |
| 46 | 47 |
| 47 views_content_client.set_task(base::Bind(&ShowContentExampleWindow)); | 48 views_content_client.set_task(base::Bind(&ShowContentExampleWindow)); |
| 48 return views_content_client.RunMain(); | 49 return views_content_client.RunMain(); |
| 49 } | 50 } |
| OLD | NEW |