| 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 "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "chrome/browser/chrome_browser_main.h" | 8 #include "chrome/browser/chrome_browser_main.h" |
| 9 #include "chrome/browser/toolkit_extra_parts.h" | 9 #include "chrome/browser/toolkit_extra_parts.h" |
| 10 #include "chrome/browser/ui/ash/ash_init.h" | 10 #include "chrome/browser/ui/ash/ash_init.h" |
| 11 #include "chrome/browser/ui/ash/ash_util.h" | 11 #include "chrome/browser/ui/ash/ash_util.h" |
| 12 #include "chrome/browser/ui/views/ash/tab_scrubber.h" | 12 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
| 13 #include "chrome/common/chrome_switches.h" | 13 #include "chrome/common/chrome_switches.h" |
| 14 #include "ui/aura/env.h" | 14 #include "ui/aura/env.h" |
| 15 #include "ui/gfx/screen.h" | 15 #include "ui/gfx/screen.h" |
| 16 #include "ui/gfx/screen_type_delegate.h" | 16 #include "ui/gfx/screen_type_delegate.h" |
| 17 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 17 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
| 18 #include "ui/views/widget/desktop_aura/desktop_stacking_client.h" | |
| 19 | 18 |
| 20 #if defined(FILE_MANAGER_EXTENSION) | 19 #if defined(FILE_MANAGER_EXTENSION) |
| 21 #include "chrome/browser/ui/views/select_file_dialog_extension.h" | 20 #include "chrome/browser/ui/views/select_file_dialog_extension.h" |
| 22 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" | 21 #include "chrome/browser/ui/views/select_file_dialog_extension_factory.h" |
| 23 #endif | 22 #endif |
| 24 | 23 |
| 25 #if !defined(OS_CHROMEOS) | 24 #if !defined(OS_CHROMEOS) |
| 26 class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate { | 25 class ScreenTypeDelegateWin : public gfx::ScreenTypeDelegate { |
| 27 public: | 26 public: |
| 28 ScreenTypeDelegateWin() {} | 27 ScreenTypeDelegateWin() {} |
| (...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 68 chrome::CloseAsh(); | 67 chrome::CloseAsh(); |
| 69 } | 68 } |
| 70 | 69 |
| 71 namespace chrome { | 70 namespace chrome { |
| 72 | 71 |
| 73 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) { | 72 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) { |
| 74 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); | 73 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); |
| 75 } | 74 } |
| 76 | 75 |
| 77 } // namespace chrome | 76 } // namespace chrome |
| OLD | NEW |