| 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/high_contrast/high_contrast_controller.h" | 9 #include "ash/high_contrast/high_contrast_controller.h" |
| 10 #include "ash/shell.h" | 10 #include "ash/shell.h" |
| (...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 81 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled( | 81 ash::Shell::GetInstance()->high_contrast_controller()->SetEnabled( |
| 82 chromeos::accessibility::IsHighContrastEnabled()); | 82 chromeos::accessibility::IsHighContrastEnabled()); |
| 83 | 83 |
| 84 if (!CommandLine::ForCurrentProcess()->HasSwitch( | 84 if (!CommandLine::ForCurrentProcess()->HasSwitch( |
| 85 switches::kDisableZeroBrowsersOpenForTests)) { | 85 switches::kDisableZeroBrowsersOpenForTests)) { |
| 86 browser::StartKeepAlive(); | 86 browser::StartKeepAlive(); |
| 87 } | 87 } |
| 88 #endif | 88 #endif |
| 89 gesture_handler_.reset(new UserGestureHandler); | 89 gesture_handler_.reset(new UserGestureHandler); |
| 90 aura::client::SetUserGestureClient( | 90 aura::client::SetUserGestureClient( |
| 91 ash::Shell::GetRootWindow(), gesture_handler_.get()); | 91 ash::Shell::GetPrimaryRootWindow(), gesture_handler_.get()); |
| 92 ash::Shell::GetRootWindow()->ShowRootWindow(); | 92 ash::Shell::GetPrimaryRootWindow()->ShowRootWindow(); |
| 93 } | 93 } |
| 94 | 94 |
| 95 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { | 95 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { |
| 96 } | 96 } |
| 97 | 97 |
| 98 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { | 98 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { |
| 99 ash::Shell::DeleteInstance(); | 99 ash::Shell::DeleteInstance(); |
| 100 } | 100 } |
| OLD | NEW |