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

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

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 #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"
11 11
12 namespace chromeos { 12 namespace chromeos {
13 class BrightnessObserver; 13 class BrightnessObserver;
14 class MagnificationManager;
15 class OutputObserver; 14 class OutputObserver;
16 class PowerButtonObserver; 15 class PowerButtonObserver;
17 class PowerStateOverride; 16 class PowerStateOverride;
18 class PrimaryDisplaySwitchObserver; 17 class PrimaryDisplaySwitchObserver;
19 class RemovableDeviceNotificationsCros; 18 class RemovableDeviceNotificationsCros;
20 class ResumeObserver; 19 class ResumeObserver;
21 class ScreenDimmingObserver; 20 class ScreenDimmingObserver;
22 class ScreenLockObserver; 21 class ScreenLockObserver;
23 class SessionManagerObserver; 22 class SessionManagerObserver;
24 class UserActivityNotifier; 23 class UserActivityNotifier;
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
62 scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_; 61 scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_;
63 scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_; 62 scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_;
64 scoped_ptr<chromeos::PowerStateOverride> power_state_override_; 63 scoped_ptr<chromeos::PowerStateOverride> power_state_override_;
65 scoped_ptr<chromeos::PrimaryDisplaySwitchObserver> 64 scoped_ptr<chromeos::PrimaryDisplaySwitchObserver>
66 primary_display_switch_observer_; 65 primary_display_switch_observer_;
67 scoped_ptr<chromeos::UserActivityNotifier> user_activity_notifier_; 66 scoped_ptr<chromeos::UserActivityNotifier> user_activity_notifier_;
68 scoped_ptr<chromeos::VideoActivityNotifier> video_activity_notifier_; 67 scoped_ptr<chromeos::VideoActivityNotifier> video_activity_notifier_;
69 scoped_ptr<chromeos::ScreenDimmingObserver> screen_dimming_observer_; 68 scoped_ptr<chromeos::ScreenDimmingObserver> screen_dimming_observer_;
70 scoped_refptr<chromeos::RemovableDeviceNotificationsCros> 69 scoped_refptr<chromeos::RemovableDeviceNotificationsCros>
71 removable_device_notifications_; 70 removable_device_notifications_;
72 scoped_ptr<chromeos::MagnificationManager> magnification_manager_;
73 71
74 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 72 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
75 }; 73 };
76 74
77 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 75 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698