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

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

Issue 11280287: Magnifier: Prevent useless operation in enabling/disabling magnifier. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: fix test failure (MagnificationManagerTest.ChangeMagnifierType) Created 8 years 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 #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 60 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_; 71 scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_;
72 scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_; 72 scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_;
73 scoped_refptr<chromeos::PowerStateOverride> power_state_override_; 73 scoped_refptr<chromeos::PowerStateOverride> power_state_override_;
74 scoped_ptr<chromeos::PrimaryDisplaySwitchObserver> 74 scoped_ptr<chromeos::PrimaryDisplaySwitchObserver>
75 primary_display_switch_observer_; 75 primary_display_switch_observer_;
76 scoped_ptr<chromeos::UserActivityNotifier> user_activity_notifier_; 76 scoped_ptr<chromeos::UserActivityNotifier> user_activity_notifier_;
77 scoped_ptr<chromeos::VideoActivityNotifier> video_activity_notifier_; 77 scoped_ptr<chromeos::VideoActivityNotifier> video_activity_notifier_;
78 scoped_ptr<chromeos::ScreenDimmingObserver> screen_dimming_observer_; 78 scoped_ptr<chromeos::ScreenDimmingObserver> screen_dimming_observer_;
79 scoped_refptr<chromeos::RemovableDeviceNotificationsCros> 79 scoped_refptr<chromeos::RemovableDeviceNotificationsCros>
80 removable_device_notifications_; 80 removable_device_notifications_;
81 scoped_ptr<chromeos::MagnificationManager> magnification_manager_;
82 81
83 scoped_ptr<internal::DBusServices> dbus_services_; 82 scoped_ptr<internal::DBusServices> dbus_services_;
84 83
85 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 84 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
86 }; 85 };
87 86
88 } // namespace chromeos 87 } // namespace chromeos
89 88
90 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 89 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698