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

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

Issue 11091023: ash : Decouple power button controller and session state controller. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Fix power button cancel behaviour + unittest 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
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 26 matching lines...) Expand all
37 #include "chrome/browser/chromeos/login/screen_locker.h" 37 #include "chrome/browser/chromeos/login/screen_locker.h"
38 #include "chrome/browser/chromeos/login/user_manager.h" 38 #include "chrome/browser/chromeos/login/user_manager.h"
39 #include "chrome/browser/chromeos/login/wallpaper_manager.h" 39 #include "chrome/browser/chromeos/login/wallpaper_manager.h"
40 #include "chrome/browser/chromeos/login/wizard_controller.h" 40 #include "chrome/browser/chromeos/login/wizard_controller.h"
41 #include "chrome/browser/chromeos/memory/low_memory_observer.h" 41 #include "chrome/browser/chromeos/memory/low_memory_observer.h"
42 #include "chrome/browser/chromeos/memory/oom_priority_manager.h" 42 #include "chrome/browser/chromeos/memory/oom_priority_manager.h"
43 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 43 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
44 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" 44 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
45 #include "chrome/browser/chromeos/power/brightness_observer.h" 45 #include "chrome/browser/chromeos/power/brightness_observer.h"
46 #include "chrome/browser/chromeos/power/output_observer.h" 46 #include "chrome/browser/chromeos/power/output_observer.h"
47 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo s.h"
48 #include "chrome/browser/chromeos/power/power_button_observer.h" 47 #include "chrome/browser/chromeos/power/power_button_observer.h"
49 #include "chrome/browser/chromeos/power/resume_observer.h" 48 #include "chrome/browser/chromeos/power/resume_observer.h"
50 #include "chrome/browser/chromeos/power/screen_dimming_observer.h" 49 #include "chrome/browser/chromeos/power/screen_dimming_observer.h"
51 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 50 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
52 #include "chrome/browser/chromeos/power/user_activity_notifier.h" 51 #include "chrome/browser/chromeos/power/user_activity_notifier.h"
53 #include "chrome/browser/chromeos/power/video_activity_notifier.h" 52 #include "chrome/browser/chromeos/power/video_activity_notifier.h"
54 #include "chrome/browser/chromeos/settings/device_settings_service.h" 53 #include "chrome/browser/chromeos/settings/device_settings_service.h"
55 #include "chrome/browser/chromeos/settings/owner_key_util.h" 54 #include "chrome/browser/chromeos/settings/owner_key_util.h"
56 #include "chrome/browser/chromeos/system/statistics_provider.h" 55 #include "chrome/browser/chromeos/system/statistics_provider.h"
57 #include "chrome/browser/chromeos/system_key_event_listener.h" 56 #include "chrome/browser/chromeos/system_key_event_listener.h"
(...skipping 555 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 LOG(WARNING) << "low_mem: Part of '100MB' experiment"; 612 LOG(WARNING) << "low_mem: Part of '100MB' experiment";
614 chromeos::LowMemoryObserver::SetLowMemoryMargin(100); 613 chromeos::LowMemoryObserver::SetLowMemoryMargin(100);
615 } else if (trial->group() == margin_200mb) { 614 } else if (trial->group() == margin_200mb) {
616 LOG(WARNING) << "low_mem: Part of '200MB' experiment"; 615 LOG(WARNING) << "low_mem: Part of '200MB' experiment";
617 chromeos::LowMemoryObserver::SetLowMemoryMargin(200); 616 chromeos::LowMemoryObserver::SetLowMemoryMargin(200);
618 } else { 617 } else {
619 LOG(WARNING) << "low_mem: Part of 'default' experiment"; 618 LOG(WARNING) << "low_mem: Part of 'default' experiment";
620 } 619 }
621 } 620 }
622 } 621 }
OLDNEW
« no previous file with comments | « ash/wm/session_state_controller.cc ('k') | chrome/browser/chromeos/power/power_button_controller_delegate_chromeos.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698