| OLD | NEW |
| 1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2013 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/chromeos/chrome_browser_main_chromeos.h" | 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <utility> | 10 #include <utility> |
| (...skipping 454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 465 new default_app_order::ExternalLoader(false /* async */)); | 465 new default_app_order::ExternalLoader(false /* async */)); |
| 466 } | 466 } |
| 467 | 467 |
| 468 if (!app_order_loader_) { | 468 if (!app_order_loader_) { |
| 469 app_order_loader_.reset( | 469 app_order_loader_.reset( |
| 470 new default_app_order::ExternalLoader(true /* async */)); | 470 new default_app_order::ExternalLoader(true /* async */)); |
| 471 } | 471 } |
| 472 | 472 |
| 473 media::SoundsManager::Create(); | 473 media::SoundsManager::Create(); |
| 474 | 474 |
| 475 AccessibilityManager::Initialize(); |
| 476 |
| 475 if (!chrome::IsRunningInMash()) { | 477 if (!chrome::IsRunningInMash()) { |
| 476 // Initialize magnification manager before ash tray is created. And this | 478 // Initialize magnification manager before ash tray is created. And this |
| 477 // must be placed after UserManager::SessionStarted(); | 479 // must be placed after UserManager::SessionStarted(); |
| 478 // TODO(sad): These components expects the ash::Shell instance to be | 480 // TODO(sad): These components expects the ash::Shell instance to be |
| 479 // created. However, when running as a mus-client, an ash::Shell instance is | 481 // created. However, when running as a mus-client, an ash::Shell instance is |
| 480 // not created. These accessibility services should instead be exposed as | 482 // not created. These accessibility services should instead be exposed as |
| 481 // separate services. crbug.com/557401 | 483 // separate services. crbug.com/557401 |
| 482 AccessibilityManager::Initialize(); | |
| 483 MagnificationManager::Initialize(); | 484 MagnificationManager::Initialize(); |
| 484 } | 485 } |
| 485 | 486 |
| 486 wallpaper::WallpaperManagerBase::SetPathIds( | 487 wallpaper::WallpaperManagerBase::SetPathIds( |
| 487 chrome::DIR_USER_DATA, | 488 chrome::DIR_USER_DATA, |
| 488 chrome::DIR_CHROMEOS_WALLPAPERS, | 489 chrome::DIR_CHROMEOS_WALLPAPERS, |
| 489 chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS); | 490 chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS); |
| 490 | 491 |
| 491 // Add observers for WallpaperManager. This depends on PowerManagerClient, | 492 // Add observers for WallpaperManager. This depends on PowerManagerClient, |
| 492 // TimezoneSettings and CrosSettings. | 493 // TimezoneSettings and CrosSettings. |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 877 // Destroy DBus services immediately after threads are stopped. | 878 // Destroy DBus services immediately after threads are stopped. |
| 878 dbus_services_.reset(); | 879 dbus_services_.reset(); |
| 879 | 880 |
| 880 ChromeBrowserMainPartsLinux::PostDestroyThreads(); | 881 ChromeBrowserMainPartsLinux::PostDestroyThreads(); |
| 881 | 882 |
| 882 // Destroy DeviceSettingsService after g_browser_process. | 883 // Destroy DeviceSettingsService after g_browser_process. |
| 883 DeviceSettingsService::Shutdown(); | 884 DeviceSettingsService::Shutdown(); |
| 884 } | 885 } |
| 885 | 886 |
| 886 } // namespace chromeos | 887 } // namespace chromeos |
| OLD | NEW |