| 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/scoped_ptr.h" | 8 #include "base/memory/scoped_ptr.h" |
| 9 #include "chrome/browser/chrome_browser_main_linux.h" | 9 #include "chrome/browser/chrome_browser_main_linux.h" |
| 10 | 10 |
| 11 namespace chromeos { | 11 namespace chromeos { |
| 12 class BrightnessObserver; | 12 class BrightnessObserver; |
| 13 class ResumeObserver; | 13 class ResumeObserver; |
| 14 class ScreenLockObserver; | 14 class ScreenLockObserver; |
| 15 class SessionManagerObserver; | 15 class SessionManagerObserver; |
| 16 | 16 |
| 17 #if defined(USE_ASH) |
| 18 class DesktopBackgroundObserver; |
| 19 #endif |
| 20 |
| 17 #if defined(USE_AURA) | 21 #if defined(USE_AURA) |
| 18 class InitialBrowserWindowObserver; | 22 class InitialBrowserWindowObserver; |
| 19 class PowerButtonObserver; | 23 class PowerButtonObserver; |
| 20 class VideoPropertyWriter; | 24 class VideoPropertyWriter; |
| 21 #endif | 25 #endif |
| 22 } // namespace chromeos | 26 } // namespace chromeos |
| 23 | 27 |
| 24 class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux { | 28 class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux { |
| 25 public: | 29 public: |
| 26 explicit ChromeBrowserMainPartsChromeos( | 30 explicit ChromeBrowserMainPartsChromeos( |
| (...skipping 13 matching lines...) Expand all Loading... |
| 40 virtual void PostBrowserStart() OVERRIDE; | 44 virtual void PostBrowserStart() OVERRIDE; |
| 41 | 45 |
| 42 virtual void PostMainMessageLoopRun() OVERRIDE; | 46 virtual void PostMainMessageLoopRun() OVERRIDE; |
| 43 | 47 |
| 44 private: | 48 private: |
| 45 scoped_ptr<chromeos::BrightnessObserver> brightness_observer_; | 49 scoped_ptr<chromeos::BrightnessObserver> brightness_observer_; |
| 46 scoped_ptr<chromeos::ResumeObserver> resume_observer_; | 50 scoped_ptr<chromeos::ResumeObserver> resume_observer_; |
| 47 scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_; | 51 scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_; |
| 48 scoped_ptr<chromeos::SessionManagerObserver> session_manager_observer_; | 52 scoped_ptr<chromeos::SessionManagerObserver> session_manager_observer_; |
| 49 | 53 |
| 54 #if defined(USE_ASH) |
| 55 scoped_ptr<chromeos::DesktopBackgroundObserver> desktop_background_observer_; |
| 56 #endif |
| 57 |
| 50 #if defined(USE_AURA) | 58 #if defined(USE_AURA) |
| 51 scoped_ptr<chromeos::InitialBrowserWindowObserver> | 59 scoped_ptr<chromeos::InitialBrowserWindowObserver> |
| 52 initial_browser_window_observer_; | 60 initial_browser_window_observer_; |
| 53 scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_; | 61 scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_; |
| 54 scoped_ptr<chromeos::VideoPropertyWriter> video_property_writer_; | 62 scoped_ptr<chromeos::VideoPropertyWriter> video_property_writer_; |
| 55 #endif | 63 #endif |
| 56 | 64 |
| 57 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); | 65 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); |
| 58 }; | 66 }; |
| 59 | 67 |
| 60 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ | 68 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ |
| OLD | NEW |