OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/ui/browser_init.h" | 5 #include "chrome/browser/ui/browser_init.h" |
6 | 6 |
7 #include <algorithm> // For max(). | 7 #include <algorithm> // For max(). |
8 | 8 |
9 #include "base/environment.h" | 9 #include "base/environment.h" |
10 #include "base/event_recorder.h" | 10 #include "base/event_recorder.h" |
(...skipping 484 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
495 in_startup = false; | 495 in_startup = false; |
496 | 496 |
497 if (!launched) { | 497 if (!launched) { |
498 LOG(ERROR) << "launch error"; | 498 LOG(ERROR) << "launch error"; |
499 if (return_code) | 499 if (return_code) |
500 *return_code = ResultCodes::INVALID_CMDLINE_URL; | 500 *return_code = ResultCodes::INVALID_CMDLINE_URL; |
501 return false; | 501 return false; |
502 } | 502 } |
503 | 503 |
504 #if defined(OS_CHROMEOS) | 504 #if defined(OS_CHROMEOS) |
| 505 // Initialize Chrome OS preferences like touch pad sensitivity. For the |
| 506 // preferences to work in the guest mode, the initialization has to be |
| 507 // done after |profile| is switched to the off-the-record profile (which |
| 508 // is actually GuestSessionProfile in the guest mode). See the |
| 509 // GetOffTheRecordProfile() call above. |
| 510 profile->InitChromeOSPreferences(); |
| 511 |
505 // Create the WmMessageListener so that it can listen for messages regardless | 512 // Create the WmMessageListener so that it can listen for messages regardless |
506 // of what window has focus. | 513 // of what window has focus. |
507 chromeos::WmMessageListener::GetInstance(); | 514 chromeos::WmMessageListener::GetInstance(); |
508 | 515 |
509 // Create the SystemKeyEventListener so it can listen for system keyboard | 516 // Create the SystemKeyEventListener so it can listen for system keyboard |
510 // messages regardless of focus. | 517 // messages regardless of focus. |
511 chromeos::SystemKeyEventListener::GetInstance(); | 518 chromeos::SystemKeyEventListener::GetInstance(); |
512 | 519 |
513 // Create the WmOverviewController so it can register with the listener. | 520 // Create the WmOverviewController so it can register with the listener. |
514 chromeos::WmOverviewController::GetInstance(); | 521 chromeos::WmOverviewController::GetInstance(); |
(...skipping 713 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1228 return false; | 1235 return false; |
1229 automation->SetExpectedTabCount(expected_tabs); | 1236 automation->SetExpectedTabCount(expected_tabs); |
1230 | 1237 |
1231 AutomationProviderList* list = | 1238 AutomationProviderList* list = |
1232 g_browser_process->InitAutomationProviderList(); | 1239 g_browser_process->InitAutomationProviderList(); |
1233 DCHECK(list); | 1240 DCHECK(list); |
1234 list->AddProvider(automation); | 1241 list->AddProvider(automation); |
1235 | 1242 |
1236 return true; | 1243 return true; |
1237 } | 1244 } |
OLD | NEW |