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

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

Issue 11194011: Reverting this CL because it was committed before I gave the final LGTM. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 8 years, 2 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 | Annotate | Revision Log
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"
11 #include "base/bind.h" 11 #include "base/bind.h"
12 #include "base/callback.h" 12 #include "base/callback.h"
13 #include "base/chromeos/chromeos_version.h" 13 #include "base/chromeos/chromeos_version.h"
14 #include "base/command_line.h" 14 #include "base/command_line.h"
15 #include "base/lazy_instance.h" 15 #include "base/lazy_instance.h"
16 #include "base/message_loop.h" 16 #include "base/message_loop.h"
17 #include "base/string_number_conversions.h" 17 #include "base/string_number_conversions.h"
18 #include "base/string_split.h" 18 #include "base/string_split.h"
19 #include "chrome/browser/browser_process.h" 19 #include "chrome/browser/browser_process.h"
20 #include "chrome/browser/chromeos/accessibility/magnification_manager.h"
21 #include "chrome/browser/chromeos/audio/audio_handler.h" 20 #include "chrome/browser/chromeos/audio/audio_handler.h"
22 #include "chrome/browser/chromeos/boot_times_loader.h" 21 #include "chrome/browser/chromeos/boot_times_loader.h"
23 #include "chrome/browser/chromeos/contacts/contact_manager.h" 22 #include "chrome/browser/chromeos/contacts/contact_manager.h"
24 #include "chrome/browser/chromeos/cros/cros_library.h" 23 #include "chrome/browser/chromeos/cros/cros_library.h"
25 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" 24 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
26 #include "chrome/browser/chromeos/display/display_preferences.h" 25 #include "chrome/browser/chromeos/display/display_preferences.h"
27 #include "chrome/browser/chromeos/display/primary_display_switch_observer.h" 26 #include "chrome/browser/chromeos/display/primary_display_switch_observer.h"
28 #include "chrome/browser/chromeos/external_metrics.h" 27 #include "chrome/browser/chromeos/external_metrics.h"
29 #include "chrome/browser/chromeos/imageburner/burn_manager.h" 28 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
30 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 29 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
(...skipping 421 matching lines...) Expand 10 before | Expand all | Expand 10 after
452 // Initialize the brightness observer so that we'll display an onscreen 451 // Initialize the brightness observer so that we'll display an onscreen
453 // indication of brightness changes during login. 452 // indication of brightness changes during login.
454 brightness_observer_.reset(new chromeos::BrightnessObserver()); 453 brightness_observer_.reset(new chromeos::BrightnessObserver());
455 output_observer_.reset(new chromeos::OutputObserver()); 454 output_observer_.reset(new chromeos::OutputObserver());
456 resume_observer_.reset(new chromeos::ResumeObserver()); 455 resume_observer_.reset(new chromeos::ResumeObserver());
457 screen_lock_observer_.reset(new chromeos::ScreenLockObserver()); 456 screen_lock_observer_.reset(new chromeos::ScreenLockObserver());
458 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) { 457 if (chromeos::KioskModeSettings::Get()->IsKioskModeEnabled()) {
459 power_state_override_.reset(new chromeos::PowerStateOverride( 458 power_state_override_.reset(new chromeos::PowerStateOverride(
460 chromeos::PowerStateOverride::BLOCK_DISPLAY_SLEEP)); 459 chromeos::PowerStateOverride::BLOCK_DISPLAY_SLEEP));
461 } 460 }
462 magnification_manager_.reset(
463 chromeos::MagnificationManager::CreateInstance());
464 461
465 primary_display_switch_observer_.reset( 462 primary_display_switch_observer_.reset(
466 new chromeos::PrimaryDisplaySwitchObserver()); 463 new chromeos::PrimaryDisplaySwitchObserver());
467 464
468 removable_device_notifications_ = 465 removable_device_notifications_ =
469 new chromeos::RemovableDeviceNotificationsCros(); 466 new chromeos::RemovableDeviceNotificationsCros();
470 467
471 chromeos::NotifyDisplayLocalStatePrefChanged(); 468 chromeos::NotifyDisplayLocalStatePrefChanged();
472 469
473 ChromeBrowserMainPartsLinux::PostProfileInit(); 470 ChromeBrowserMainPartsLinux::PostProfileInit();
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
538 // Tell DeviceSettingsService to stop talking to session_manager. 535 // Tell DeviceSettingsService to stop talking to session_manager.
539 chromeos::DeviceSettingsService::Get()->Shutdown(); 536 chromeos::DeviceSettingsService::Get()->Shutdown();
540 537
541 // We should remove observers attached to D-Bus clients before 538 // We should remove observers attached to D-Bus clients before
542 // DBusThreadManager is shut down. 539 // DBusThreadManager is shut down.
543 screen_lock_observer_.reset(); 540 screen_lock_observer_.reset();
544 resume_observer_.reset(); 541 resume_observer_.reset();
545 brightness_observer_.reset(); 542 brightness_observer_.reset();
546 output_observer_.reset(); 543 output_observer_.reset();
547 power_state_override_.reset(); 544 power_state_override_.reset();
548 magnification_manager_.reset();
549 545
550 // The XInput2 event listener needs to be shut down earlier than when 546 // The XInput2 event listener needs to be shut down earlier than when
551 // Singletons are finally destroyed in AtExitManager. 547 // Singletons are finally destroyed in AtExitManager.
552 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop(); 548 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();
553 549
554 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, 550 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
555 // even if Initialize() wasn't called. 551 // even if Initialize() wasn't called.
556 chromeos::SystemKeyEventListener::Shutdown(); 552 chromeos::SystemKeyEventListener::Shutdown();
557 chromeos::imageburner::BurnManager::Shutdown(); 553 chromeos::imageburner::BurnManager::Shutdown();
558 chromeos::AudioHandler::Shutdown(); 554 chromeos::AudioHandler::Shutdown();
(...skipping 58 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; 613 LOG(WARNING) << "low_mem: Part of '100MB' experiment";
618 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); 614 chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
619 } else if (trial->group() == margin_200mb) { 615 } else if (trial->group() == margin_200mb) {
620 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 616 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
621 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); 617 chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
622 } else { 618 } else {
623 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 619 LOG(WARNING) << "low_mem: Part of 'default' experiment";
624 } 620 }
625 } 621 }
626 } 622 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/chrome_browser_main_chromeos.h ('k') | chrome/browser/chromeos/login/wizard_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698