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/views/ash/chrome_browser_main_extra_parts_ash.h" | 5 #include "chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.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/ash/ash_init.h" | 9 #include "chrome/browser/ui/ash/ash_init.h" |
10 #include "ui/aura/desktop/desktop_screen.h" | 10 #include "ui/aura/desktop/desktop_screen.h" |
11 #include "ui/aura/desktop/desktop_stacking_client.h" | 11 #include "ui/aura/desktop/desktop_stacking_client.h" |
12 #include "ui/aura/env.h" | 12 #include "ui/aura/env.h" |
13 #include "ui/aura/single_display_manager.h" | 13 #include "ui/aura/single_display_manager.h" |
14 #include "ui/gfx/screen.h" | 14 #include "ui/gfx/screen.h" |
15 | 15 |
16 #if defined(FILE_MANAGER_EXTENSION) | 16 #if defined(FILE_MANAGER_EXTENSION) |
17 #include "chrome/browser/ui/views/select_file_dialog_extension.h" | |
18 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" | 17 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
19 #endif | 18 #endif |
20 | 19 |
21 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() { | 20 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() { |
22 } | 21 } |
23 | 22 |
24 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() { | 23 ChromeBrowserMainExtraPartsAsh::~ChromeBrowserMainExtraPartsAsh() { |
25 } | 24 } |
26 | 25 |
27 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { | 26 void ChromeBrowserMainExtraPartsAsh::PreProfileInit() { |
(...skipping 17 matching lines...) Expand all Loading... |
45 chrome::CloseAsh(); | 44 chrome::CloseAsh(); |
46 } | 45 } |
47 | 46 |
48 namespace chrome { | 47 namespace chrome { |
49 | 48 |
50 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) { | 49 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) { |
51 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); | 50 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); |
52 } | 51 } |
53 | 52 |
54 } // namespace chrome | 53 } // namespace chrome |
OLD | NEW |