| 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/chrome_browser_main_extra_parts_ash.h" | 5 #include "chrome/browser/chrome_browser_main_extra_parts_ash.h" |
| 6 | 6 |
| 7 #include "ash/accelerators/accelerator_controller.h" | 7 #include "ash/accelerators/accelerator_controller.h" |
| 8 #include "ash/ash_switches.h" | 8 #include "ash/ash_switches.h" |
| 9 #include "ash/shell.h" | 9 #include "ash/shell.h" |
| 10 #include "ash/wm/key_rewriter_event_filter.h" | 10 #include "ash/wm/key_rewriter_event_filter.h" |
| (...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 76 shell->accelerator_controller()->SetVolumeControlDelegate( | 76 shell->accelerator_controller()->SetVolumeControlDelegate( |
| 77 scoped_ptr<ash::VolumeControlDelegate>(new VolumeController).Pass()); | 77 scoped_ptr<ash::VolumeControlDelegate>(new VolumeController).Pass()); |
| 78 | 78 |
| 79 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 79 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 80 switches::kDisableZeroBrowsersOpenForTests)) | 80 switches::kDisableZeroBrowsersOpenForTests)) |
| 81 BrowserList::StartKeepAlive(); | 81 BrowserList::StartKeepAlive(); |
| 82 #endif | 82 #endif |
| 83 gesture_handler_.reset(new UserGestureHandler); | 83 gesture_handler_.reset(new UserGestureHandler); |
| 84 aura::client::SetUserGestureClient( | 84 aura::client::SetUserGestureClient( |
| 85 ash::Shell::GetRootWindow(), gesture_handler_.get()); | 85 ash::Shell::GetRootWindow(), gesture_handler_.get()); |
| 86 ash::Shell::GetRootWindow()->ShowRootWindow(); |
| 86 } | 87 } |
| 87 | 88 |
| 88 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { | 89 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
| 89 } | 90 } |
| 90 | 91 |
| 91 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 92 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
| 92 ash::Shell::DeleteInstance(); | 93 ash::Shell::DeleteInstance(); |
| 93 } | 94 } |
| OLD | NEW |