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 "ash/session_state_delegate.h" | 7 #include "ash/session_state_delegate.h" |
8 #include "ash/shell.h" | 8 #include "ash/shell.h" |
9 #include "base/command_line.h" | 9 #include "base/command_line.h" |
10 #include "base/lazy_instance.h" | 10 #include "base/lazy_instance.h" |
11 #include "chrome/browser/chrome_browser_main.h" | 11 #include "chrome/browser/chrome_browser_main.h" |
12 #include "chrome/browser/toolkit_extra_parts.h" | |
13 #include "chrome/browser/ui/ash/ash_init.h" | 12 #include "chrome/browser/ui/ash/ash_init.h" |
14 #include "chrome/browser/ui/ash/ash_util.h" | 13 #include "chrome/browser/ui/ash/ash_util.h" |
15 #include "chrome/browser/ui/views/ash/tab_scrubber.h" | 14 #include "chrome/browser/ui/views/ash/tab_scrubber.h" |
16 #include "chrome/common/chrome_switches.h" | 15 #include "chrome/common/chrome_switches.h" |
17 #include "ui/aura/env.h" | 16 #include "ui/aura/env.h" |
18 #include "ui/gfx/screen.h" | 17 #include "ui/gfx/screen.h" |
19 #include "ui/gfx/screen_type_delegate.h" | 18 #include "ui/gfx/screen_type_delegate.h" |
20 #include "ui/keyboard/keyboard.h" | 19 #include "ui/keyboard/keyboard.h" |
21 #include "ui/keyboard/keyboard_util.h" | 20 #include "ui/keyboard/keyboard_util.h" |
22 #include "ui/views/widget/desktop_aura/desktop_screen.h" | 21 #include "ui/views/widget/desktop_aura/desktop_screen.h" |
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
93 if (ash::Shell::HasInstance() && | 92 if (ash::Shell::HasInstance() && |
94 !CommandLine::ForCurrentProcess()->HasSwitch( | 93 !CommandLine::ForCurrentProcess()->HasSwitch( |
95 switches::kAshDisableTabScrubbing)) { | 94 switches::kAshDisableTabScrubbing)) { |
96 TabScrubber::GetInstance(); | 95 TabScrubber::GetInstance(); |
97 } | 96 } |
98 } | 97 } |
99 | 98 |
100 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 99 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
101 chrome::CloseAsh(); | 100 chrome::CloseAsh(); |
102 } | 101 } |
103 | |
104 namespace chrome { | |
105 | |
106 void AddAshToolkitExtraParts(ChromeBrowserMainParts* main_parts) { | |
107 main_parts->AddParts(new ChromeBrowserMainExtraPartsAsh()); | |
108 } | |
109 | |
110 } // namespace chrome | |
OLD | NEW |