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

Unified Diff: ash/shell.cc

Issue 1840913002: A11y setting: mono audio UI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix SettingsAdvancedPageBrowserTest.Load browser_test failure Created 4 years, 8 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 side-by-side diff with in-line comments
Download patch
Index: ash/shell.cc
diff --git a/ash/shell.cc b/ash/shell.cc
index b4972ec0a3a2024221a3e77d605e06c855dc8caa..fa03dbee0708970a3e6db4b52b8f024dcd0e006c 100644
--- a/ash/shell.cc
+++ b/ash/shell.cc
@@ -140,6 +140,7 @@
#include "ash/virtual_keyboard_controller.h"
#include "base/bind_helpers.h"
#include "base/sys_info.h"
+#include "chromeos/audio/audio_a11y_controller.h"
#include "chromeos/dbus/dbus_thread_manager.h"
#include "ui/chromeos/user_activity_power_manager_notifier.h"
#include "ui/display/chromeos/display_configurator.h"
@@ -763,6 +764,10 @@ Shell::~Shell() {
video_detector_.reset();
high_contrast_controller_.reset();
+#if defined(OS_CHROMEOS)
+ audio_a11y_controller_.reset();
+#endif // defined(OS_CHROMEOS)
oshima 2016/04/11 17:05:30 since you initialized very early on, can you destr
Qiang(Joe) Xu 2016/04/11 20:59:09 Done.
+
shadow_controller_.reset();
resize_shadow_controller_.reset();
@@ -1093,6 +1098,10 @@ void Shell::Init(const ShellInitParams& init_params) {
virtual_keyboard_controller_.reset(new VirtualKeyboardController);
#endif // defined(OS_CHROMEOS)
+#if defined(OS_CHROMEOS)
+ audio_a11y_controller_.reset(new chromeos::AudioA11yController);
+#endif // defined(OS_CHROMEOS)
+
// It needs to be created after RootWindowController has been created
// (which calls OnWindowResized has been called, otherwise the
// widget will not paint when restoring after a browser crash. Also it needs
« no previous file with comments | « ash/shell.h ('k') | ash/system/tray_accessibility.h » ('j') | ash/system/tray_accessibility.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698