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

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

Issue 11358083: Decouple c/b/cros/audio from c/b/speech. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/chromeos/audio/audio_mixer_cras.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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/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/shell.h" 10 #include "ash/shell.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
60 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" 60 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
61 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 61 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
62 #include "chrome/browser/defaults.h" 62 #include "chrome/browser/defaults.h"
63 #include "chrome/browser/metrics/metrics_service.h" 63 #include "chrome/browser/metrics/metrics_service.h"
64 #include "chrome/browser/net/chrome_network_delegate.h" 64 #include "chrome/browser/net/chrome_network_delegate.h"
65 #include "chrome/browser/policy/browser_policy_connector.h" 65 #include "chrome/browser/policy/browser_policy_connector.h"
66 #include "chrome/browser/prefs/pref_service.h" 66 #include "chrome/browser/prefs/pref_service.h"
67 #include "chrome/browser/profiles/profile.h" 67 #include "chrome/browser/profiles/profile.h"
68 #include "chrome/browser/profiles/profile_manager.h" 68 #include "chrome/browser/profiles/profile_manager.h"
69 #include "chrome/browser/signin/token_service_factory.h" 69 #include "chrome/browser/signin/token_service_factory.h"
70 #include "chrome/browser/speech/extension_api/tts_extension_api_chromeos.h"
70 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos. h" 71 #include "chrome/browser/system_monitor/removable_device_notifications_chromeos. h"
71 #include "chrome/common/chrome_notification_types.h" 72 #include "chrome/common/chrome_notification_types.h"
72 #include "chrome/common/chrome_switches.h" 73 #include "chrome/common/chrome_switches.h"
73 #include "chrome/common/chrome_version_info.h" 74 #include "chrome/common/chrome_version_info.h"
74 #include "chrome/common/logging_chrome.h" 75 #include "chrome/common/logging_chrome.h"
75 #include "chrome/common/pref_names.h" 76 #include "chrome/common/pref_names.h"
76 #include "chromeos/cryptohome/async_method_caller.h" 77 #include "chromeos/cryptohome/async_method_caller.h"
77 #include "chromeos/dbus/dbus_thread_manager.h" 78 #include "chromeos/dbus/dbus_thread_manager.h"
78 #include "chromeos/dbus/power_manager_client.h" 79 #include "chromeos/dbus/power_manager_client.h"
79 #include "chromeos/dbus/session_manager_client.h" 80 #include "chromeos/dbus/session_manager_client.h"
(...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after
322 chromeos::input_method::InputMethodManager::GetInstance()-> 323 chromeos::input_method::InputMethodManager::GetInstance()->
323 GetXKeyboard()->SetNumLockEnabled(false); 324 GetXKeyboard()->SetNumLockEnabled(false);
324 } 325 }
325 326
326 ChromeBrowserMainPartsLinux::PostMainMessageLoopStart(); 327 ChromeBrowserMainPartsLinux::PostMainMessageLoopStart();
327 } 328 }
328 329
329 // Threads are initialized MainMessageLoopStart and MainMessageLoopRun. 330 // Threads are initialized MainMessageLoopStart and MainMessageLoopRun.
330 331
331 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() { 332 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
332 chromeos::AudioHandler::Initialize(); 333 chromeos::AudioHandler::Initialize(base::Bind(&EnableChromeOsTts));
333 chromeos::imageburner::BurnManager::Initialize(); 334 chromeos::imageburner::BurnManager::Initialize();
334 335
335 // Listen for system key events so that the user will be able to adjust the 336 // Listen for system key events so that the user will be able to adjust the
336 // volume on the login screen, if Chrome is running on Chrome OS 337 // volume on the login screen, if Chrome is running on Chrome OS
337 // (i.e. not Linux desktop), and in non-test mode. 338 // (i.e. not Linux desktop), and in non-test mode.
338 // Note: SystemKeyEventListener depends on the DBus thread. 339 // Note: SystemKeyEventListener depends on the DBus thread.
339 if (base::chromeos::IsRunningOnChromeOS() && 340 if (base::chromeos::IsRunningOnChromeOS() &&
340 !parameters().ui_task) { // ui_task is non-NULL when running tests. 341 !parameters().ui_task) { // ui_task is non-NULL when running tests.
341 chromeos::SystemKeyEventListener::Initialize(); 342 chromeos::SystemKeyEventListener::Initialize();
342 } 343 }
(...skipping 291 matching lines...) Expand 10 before | Expand all | Expand 10 after
634 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; 635 LOG(WARNING) << "low_mem: Part of '100MB' experiment";
635 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); 636 chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
636 } else if (trial->group() == margin_200mb) { 637 } else if (trial->group() == margin_200mb) {
637 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 638 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
638 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); 639 chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
639 } else { 640 } else {
640 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 641 LOG(WARNING) << "low_mem: Part of 'default' experiment";
641 } 642 }
642 } 643 }
643 } 644 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/audio/audio_mixer_cras.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698