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

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

Issue 1185753008: Proposed alternative for supporting ChromeVox keyboard commands. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove ui/events/* changes. Created 5 years, 6 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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
11 #include "ash/shell.h" 11 #include "ash/shell.h"
12 #include "base/bind.h" 12 #include "base/bind.h"
13 #include "base/callback.h" 13 #include "base/callback.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/files/file_util.h" 15 #include "base/files/file_util.h"
16 #include "base/lazy_instance.h" 16 #include "base/lazy_instance.h"
17 #include "base/linux_util.h" 17 #include "base/linux_util.h"
18 #include "base/path_service.h" 18 #include "base/path_service.h"
19 #include "base/prefs/pref_service.h" 19 #include "base/prefs/pref_service.h"
20 #include "base/strings/string_number_conversions.h" 20 #include "base/strings/string_number_conversions.h"
21 #include "base/strings/string_split.h" 21 #include "base/strings/string_split.h"
22 #include "base/sys_info.h" 22 #include "base/sys_info.h"
23 #include "base/task_runner_util.h" 23 #include "base/task_runner_util.h"
24 #include "chrome/browser/browser_process.h" 24 #include "chrome/browser/browser_process.h"
25 #include "chrome/browser/browser_process_platform_part_chromeos.h" 25 #include "chrome/browser/browser_process_platform_part_chromeos.h"
26 #include "chrome/browser/chrome_notification_types.h" 26 #include "chrome/browser/chrome_notification_types.h"
27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h" 27 #include "chrome/browser/chromeos/accessibility/accessibility_manager.h"
28 #include "chrome/browser/chromeos/accessibility/magnification_manager.h" 28 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
29 #include "chrome/browser/chromeos/accessibility/spoken_feedback_event_rewriter.h "
29 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h" 30 #include "chrome/browser/chromeos/app_mode/kiosk_app_launch_error.h"
30 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 31 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
31 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h" 32 #include "chrome/browser/chromeos/app_mode/kiosk_mode_idle_app_name_notification .h"
32 #include "chrome/browser/chromeos/boot_times_recorder.h" 33 #include "chrome/browser/chromeos/boot_times_recorder.h"
33 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h" 34 #include "chrome/browser/chromeos/dbus/chrome_console_service_provider_delegate. h"
34 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h" 35 #include "chrome/browser/chromeos/dbus/chrome_display_power_service_provider_del egate.h"
35 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h" 36 #include "chrome/browser/chromeos/dbus/chrome_proxy_resolver_delegate.h"
36 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h" 37 #include "chrome/browser/chromeos/dbus/screen_lock_service_provider.h"
37 #include "chrome/browser/chromeos/events/event_rewriter.h" 38 #include "chrome/browser/chromeos/events/event_rewriter.h"
38 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" 39 #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
(...skipping 607 matching lines...) Expand 10 before | Expand all | Expand 10 after
646 // These are dependent on the ash::Shell singleton already having been 647 // These are dependent on the ash::Shell singleton already having been
647 // initialized. 648 // initialized.
648 // TODO(oshima): Remove ash dependency in PowerButtonObserver. 649 // TODO(oshima): Remove ash dependency in PowerButtonObserver.
649 // crbug.com/408832. 650 // crbug.com/408832.
650 power_button_observer_.reset(new PowerButtonObserver); 651 power_button_observer_.reset(new PowerButtonObserver);
651 data_promo_notification_.reset(new DataPromoNotification()); 652 data_promo_notification_.reset(new DataPromoNotification());
652 653
653 keyboard_event_rewriters_.reset(new EventRewriterController()); 654 keyboard_event_rewriters_.reset(new EventRewriterController());
654 keyboard_event_rewriters_->AddEventRewriter( 655 keyboard_event_rewriters_->AddEventRewriter(
655 scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter())); 656 scoped_ptr<ui::EventRewriter>(new KeyboardDrivenEventRewriter()));
657 keyboard_event_rewriters_->AddEventRewriter(
658 scoped_ptr<ui::EventRewriter>(new SpokenFeedbackEventRewriter(nullptr)));
656 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>( 659 keyboard_event_rewriters_->AddEventRewriter(scoped_ptr<ui::EventRewriter>(
657 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller()))); 660 new EventRewriter(ash::Shell::GetInstance()->sticky_keys_controller())));
658 keyboard_event_rewriters_->Init(); 661 keyboard_event_rewriters_->Init();
659 662
660 ChromeBrowserMainPartsLinux::PostBrowserStart(); 663 ChromeBrowserMainPartsLinux::PostBrowserStart();
661 } 664 }
662 665
663 // Shut down services before the browser process, etc are destroyed. 666 // Shut down services before the browser process, etc are destroyed.
664 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() { 667 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopRun() {
665 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true); 668 BootTimesRecorder::Get()->AddLogoutTimeMarker("UIMessageLoopEnded", true);
(...skipping 109 matching lines...) Expand 10 before | Expand all | Expand 10 after
775 // Destroy DBus services immediately after threads are stopped. 778 // Destroy DBus services immediately after threads are stopped.
776 dbus_services_.reset(); 779 dbus_services_.reset();
777 780
778 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 781 ChromeBrowserMainPartsLinux::PostDestroyThreads();
779 782
780 // Destroy DeviceSettingsService after g_browser_process. 783 // Destroy DeviceSettingsService after g_browser_process.
781 DeviceSettingsService::Shutdown(); 784 DeviceSettingsService::Shutdown();
782 } 785 }
783 786
784 } // namespace chromeos 787 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698