chrome/browser/chromeos/chrome_browser_main_chromeos.h - Issue 10832035: Switch from SignedSettings to DeviceSettingsService.

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

Issue 10832035: Switch from SignedSettings to DeviceSettingsService. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase. Created 8 years, 3 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 | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | chrome/chrome_tests.gypi » ('J')

OLD	NEW
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 #ifndef CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_	5 #ifndef CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_

6 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_	6 #define CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_

7	7

8 #include "base/memory/ref_counted.h"	8 #include "base/memory/ref_counted.h"

9 #include "base/memory/scoped_ptr.h"	9 #include "base/memory/scoped_ptr.h"

10 #include "chrome/browser/chrome_browser_main_linux.h"	10 #include "chrome/browser/chrome_browser_main_linux.h"

(...skipping 44 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
55	55

56 private:	56 private:

57 // Set up field trial for low memory headroom settings.	57 // Set up field trial for low memory headroom settings.

58 void SetupLowMemoryHeadroomFieldTrial();	58 void SetupLowMemoryHeadroomFieldTrial();

59	59

60 scoped_ptr<contacts::ContactManager> contact_manager_;	60 scoped_ptr<contacts::ContactManager> contact_manager_;

61 scoped_ptr<chromeos::BrightnessObserver> brightness_observer_;	61 scoped_ptr<chromeos::BrightnessObserver> brightness_observer_;

62 scoped_ptr<chromeos::OutputObserver> output_observer_;	62 scoped_ptr<chromeos::OutputObserver> output_observer_;

63 scoped_ptr<chromeos::ResumeObserver> resume_observer_;	63 scoped_ptr<chromeos::ResumeObserver> resume_observer_;

64 scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_;	64 scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_;

65 scoped_ptr<chromeos::SessionManagerObserver> session_manager_observer_;

66 scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_;	65 scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_;

67 scoped_ptr<chromeos::PowerStateOverride> power_state_override_;	66 scoped_ptr<chromeos::PowerStateOverride> power_state_override_;

68 scoped_ptr<chromeos::UserActivityNotifier> user_activity_notifier_;	67 scoped_ptr<chromeos::UserActivityNotifier> user_activity_notifier_;

69 scoped_ptr<chromeos::VideoActivityNotifier> video_activity_notifier_;	68 scoped_ptr<chromeos::VideoActivityNotifier> video_activity_notifier_;

70 scoped_ptr<chromeos::ScreenDimmingObserver> screen_dimming_observer_;	69 scoped_ptr<chromeos::ScreenDimmingObserver> screen_dimming_observer_;

71 scoped_ptr<policy::NetworkConfigurationUpdater> network_config_updater_;	70 scoped_ptr<policy::NetworkConfigurationUpdater> network_config_updater_;

72 scoped_refptr<chromeos::MediaDeviceNotifications> media_device_notifications_;	71 scoped_refptr<chromeos::MediaDeviceNotifications> media_device_notifications_;

73	72

74 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);	73 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);

75 };	74 };

76	75

77 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_	76 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_

OLD	NEW