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

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

Issue 10970071: chromeos: Destroy PowerStateOverride before D-Bus. (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
« no previous file with comments | « no previous file | 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 529 matching lines...) Expand 10 before | Expand all | Expand 10 after
540 // Tell DeviceSettingsService to stop talking to session_manager. 540 // Tell DeviceSettingsService to stop talking to session_manager.
541 chromeos::DeviceSettingsService::Get()->Shutdown(); 541 chromeos::DeviceSettingsService::Get()->Shutdown();
542 542
543 // We should remove observers attached to D-Bus clients before 543 // We should remove observers attached to D-Bus clients before
544 // DBusThreadManager is shut down. 544 // DBusThreadManager is shut down.
545 screen_lock_observer_.reset(); 545 screen_lock_observer_.reset();
546 resume_observer_.reset(); 546 resume_observer_.reset();
547 brightness_observer_.reset(); 547 brightness_observer_.reset();
548 media_transfer_protocol_device_observer_.reset(); 548 media_transfer_protocol_device_observer_.reset();
549 output_observer_.reset(); 549 output_observer_.reset();
550 power_state_override_.reset();
550 551
551 // The XInput2 event listener needs to be shut down earlier than when 552 // The XInput2 event listener needs to be shut down earlier than when
552 // Singletons are finally destroyed in AtExitManager. 553 // Singletons are finally destroyed in AtExitManager.
553 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop(); 554 chromeos::XInputHierarchyChangedEventListener::GetInstance()->Stop();
554 555
555 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call, 556 // chromeos::SystemKeyEventListener::Shutdown() is always safe to call,
556 // even if Initialize() wasn't called. 557 // even if Initialize() wasn't called.
557 chromeos::SystemKeyEventListener::Shutdown(); 558 chromeos::SystemKeyEventListener::Shutdown();
558 chromeos::imageburner::BurnManager::Shutdown(); 559 chromeos::imageburner::BurnManager::Shutdown();
559 chromeos::AudioHandler::Shutdown(); 560 chromeos::AudioHandler::Shutdown();
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
617 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; 618 LOG(WARNING) << "low_mem: Part of '100MB' experiment";
618 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); 619 chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
619 } else if (trial->group() == margin_200mb) { 620 } else if (trial->group() == margin_200mb) {
620 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 621 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
621 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); 622 chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
622 } else { 623 } else {
623 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 624 LOG(WARNING) << "low_mem: Part of 'default' experiment";
624 } 625 }
625 } 626 }
626 } 627 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698