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 "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h" | 5 #include "chrome/browser/ui/aura/chrome_browser_main_extra_parts_aura.h" |
6 | 6 |
7 #include "chrome/browser/chrome_browser_main.h" | 7 #include "chrome/browser/chrome_browser_main.h" |
8 #include "chrome/browser/toolkit_extra_parts.h" | 8 #include "chrome/browser/toolkit_extra_parts.h" |
9 #include "chrome/browser/ui/aura/active_desktop_monitor.h" | 9 #include "chrome/browser/ui/aura/active_desktop_monitor.h" |
10 #include "ui/aura/env.h" | 10 #include "ui/aura/env.h" |
11 #include "ui/gfx/screen.h" | 11 #include "ui/gfx/screen.h" |
12 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 12 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
13 #include "ui/views/widget/native_widget_aura.h" | 13 #include "ui/views/widget/native_widget_aura.h" |
14 | 14 |
15 #if defined(OS_LINUX) | 15 #if defined(OS_LINUX) |
16 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" | 16 #include "chrome/browser/ui/libgtk2ui/gtk2_ui.h" |
17 #include "ui/base/linux_ui.h" | 17 #include "ui/linux_ui/linux_ui.h" |
18 #else | 18 #else |
19 #endif | 19 #endif |
20 | 20 |
21 #if defined(USE_ASH) | 21 #if defined(USE_ASH) |
22 #include "chrome/browser/ui/ash/ash_init.h" | 22 #include "chrome/browser/ui/ash/ash_init.h" |
23 #endif | 23 #endif |
24 | 24 |
25 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() { | 25 ChromeBrowserMainExtraPartsAura::ChromeBrowserMainExtraPartsAura() { |
26 } | 26 } |
27 | 27 |
(...skipping 25 matching lines...) Expand all Loading... |
53 // after the metrics service is deleted. | 53 // after the metrics service is deleted. |
54 } | 54 } |
55 | 55 |
56 namespace chrome { | 56 namespace chrome { |
57 | 57 |
58 void AddAuraToolkitExtraParts(ChromeBrowserMainParts* main_parts) { | 58 void AddAuraToolkitExtraParts(ChromeBrowserMainParts* main_parts) { |
59 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); | 59 main_parts->AddParts(new ChromeBrowserMainExtraPartsAura()); |
60 } | 60 } |
61 | 61 |
62 } // namespace chrome | 62 } // namespace chrome |
OLD | NEW |