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/macros.h" |
5 #include "content/public/browser/context_factory.h" | 6 #include "content/public/browser/context_factory.h" |
6 #include "content/shell/browser/shell_browser_context.h" | 7 #include "content/shell/browser/shell_browser_context.h" |
7 #include "ui/aura/test/test_screen.h" | 8 #include "ui/aura/test/test_screen.h" |
8 #include "ui/aura/window.h" | 9 #include "ui/aura/window.h" |
9 #include "ui/gfx/screen.h" | 10 #include "ui/gfx/screen.h" |
10 #include "ui/views_content_client/views_content_client.h" | 11 #include "ui/views_content_client/views_content_client.h" |
11 #include "ui/views_content_client/views_content_client_main_parts_aura.h" | 12 #include "ui/views_content_client/views_content_client_main_parts_aura.h" |
12 #include "ui/wm/core/nested_accelerator_controller.h" | 13 #include "ui/wm/core/nested_accelerator_controller.h" |
13 #include "ui/wm/core/nested_accelerator_delegate.h" | 14 #include "ui/wm/core/nested_accelerator_delegate.h" |
14 #include "ui/wm/test/wm_test_helper.h" | 15 #include "ui/wm/test/wm_test_helper.h" |
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
94 | 95 |
95 // static | 96 // static |
96 ViewsContentClientMainParts* ViewsContentClientMainParts::Create( | 97 ViewsContentClientMainParts* ViewsContentClientMainParts::Create( |
97 const content::MainFunctionParams& content_params, | 98 const content::MainFunctionParams& content_params, |
98 ViewsContentClient* views_content_client) { | 99 ViewsContentClient* views_content_client) { |
99 return new ViewsContentClientMainPartsChromeOS( | 100 return new ViewsContentClientMainPartsChromeOS( |
100 content_params, views_content_client); | 101 content_params, views_content_client); |
101 } | 102 } |
102 | 103 |
103 } // namespace ui | 104 } // namespace ui |
OLD | NEW |