| 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/shell/browser/shell_browser_context.h" | 6 #include "content/shell/browser/shell_browser_context.h" |
| 6 #include "ui/aura/env.h" | 7 #include "ui/aura/env.h" |
| 7 #include "ui/gfx/screen.h" | 8 #include "ui/gfx/screen.h" |
| 8 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 9 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
| 9 #include "ui/views_content_client/views_content_client.h" | 10 #include "ui/views_content_client/views_content_client.h" |
| 10 #include "ui/views_content_client/views_content_client_main_parts_aura.h" | 11 #include "ui/views_content_client/views_content_client_main_parts_aura.h" |
| 11 | 12 |
| 12 namespace ui { | 13 namespace ui { |
| 13 | 14 |
| 14 namespace { | 15 namespace { |
| (...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 48 | 49 |
| 49 // static | 50 // static |
| 50 ViewsContentClientMainParts* ViewsContentClientMainParts::Create( | 51 ViewsContentClientMainParts* ViewsContentClientMainParts::Create( |
| 51 const content::MainFunctionParams& content_params, | 52 const content::MainFunctionParams& content_params, |
| 52 ViewsContentClient* views_content_client) { | 53 ViewsContentClient* views_content_client) { |
| 53 return new ViewsContentClientMainPartsDesktopAura( | 54 return new ViewsContentClientMainPartsDesktopAura( |
| 54 content_params, views_content_client); | 55 content_params, views_content_client); |
| 55 } | 56 } |
| 56 | 57 |
| 57 } // namespace ui | 58 } // namespace ui |
| OLD | NEW |