Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(101)

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Issue 2316553003: mash: Add autoclick app. (Closed)
Patch Set: Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
466 new default_app_order::ExternalLoader(false /* async */)); 466 new default_app_order::ExternalLoader(false /* async */));
467 } 467 }
468 468
469 if (!app_order_loader_) { 469 if (!app_order_loader_) {
470 app_order_loader_.reset( 470 app_order_loader_.reset(
471 new default_app_order::ExternalLoader(true /* async */)); 471 new default_app_order::ExternalLoader(true /* async */));
472 } 472 }
473 473
474 media::SoundsManager::Create(); 474 media::SoundsManager::Create();
475 475
476 AccessibilityManager::Initialize();
477
476 if (!chrome::IsRunningInMash()) { 478 if (!chrome::IsRunningInMash()) {
477 // Initialize magnification manager before ash tray is created. And this 479 // Initialize magnification manager before ash tray is created. And this
478 // must be placed after UserManager::SessionStarted(); 480 // must be placed after UserManager::SessionStarted();
479 // TODO(sad): These components expects the ash::Shell instance to be 481 // TODO(sad): These components expects the ash::Shell instance to be
480 // created. However, when running as a mus-client, an ash::Shell instance is 482 // created. However, when running as a mus-client, an ash::Shell instance is
481 // not created. These accessibility services should instead be exposed as 483 // not created. These accessibility services should instead be exposed as
482 // separate services. crbug.com/557401 484 // separate services. crbug.com/557401
483 AccessibilityManager::Initialize();
484 MagnificationManager::Initialize(); 485 MagnificationManager::Initialize();
485 } 486 }
486 487
487 wallpaper::WallpaperManagerBase::SetPathIds( 488 wallpaper::WallpaperManagerBase::SetPathIds(
488 chrome::DIR_USER_DATA, 489 chrome::DIR_USER_DATA,
489 chrome::DIR_CHROMEOS_WALLPAPERS, 490 chrome::DIR_CHROMEOS_WALLPAPERS,
490 chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS); 491 chrome::DIR_CHROMEOS_CUSTOM_WALLPAPERS);
491 492
492 // Add observers for WallpaperManager. This depends on PowerManagerClient, 493 // Add observers for WallpaperManager. This depends on PowerManagerClient,
493 // TimezoneSettings and CrosSettings. 494 // TimezoneSettings and CrosSettings.
(...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after
878 // Destroy DBus services immediately after threads are stopped. 879 // Destroy DBus services immediately after threads are stopped.
879 dbus_services_.reset(); 880 dbus_services_.reset();
880 881
881 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 882 ChromeBrowserMainPartsLinux::PostDestroyThreads();
882 883
883 // Destroy DeviceSettingsService after g_browser_process. 884 // Destroy DeviceSettingsService after g_browser_process.
884 DeviceSettingsService::Shutdown(); 885 DeviceSettingsService::Shutdown();
885 } 886 }
886 887
887 } // namespace chromeos 888 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698