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

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

Issue 11318008: cros: Allow default app order to be loaded from an external file. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: for comments in #1 Created 8 years, 1 month 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') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 OutputObserver; 14 class OutputObserver;
15 class PowerButtonObserver; 15 class PowerButtonObserver;
16 class PowerStateOverride; 16 class PowerStateOverride;
17 class PrimaryDisplaySwitchObserver; 17 class PrimaryDisplaySwitchObserver;
18 class RemovableDeviceNotificationsCros; 18 class RemovableDeviceNotificationsCros;
19 class ResumeObserver; 19 class ResumeObserver;
20 class ScreenDimmingObserver; 20 class ScreenDimmingObserver;
21 class ScreenLockObserver; 21 class ScreenLockObserver;
22 class SessionManagerObserver; 22 class SessionManagerObserver;
23 class UserActivityNotifier; 23 class UserActivityNotifier;
24 class VideoActivityNotifier; 24 class VideoActivityNotifier;
25
26 namespace default_app_order {
27 class ExternalLoader;
28 }
29
25 } // namespace chromeos 30 } // namespace chromeos
26 31
27 namespace contacts { 32 namespace contacts {
28 class ContactManager; 33 class ContactManager;
29 } // namespace contacts 34 } // namespace contacts
30 35
31 class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux { 36 class ChromeBrowserMainPartsChromeos : public ChromeBrowserMainPartsLinux {
32 public: 37 public:
33 explicit ChromeBrowserMainPartsChromeos( 38 explicit ChromeBrowserMainPartsChromeos(
34 const content::MainFunctionParams& parameters); 39 const content::MainFunctionParams& parameters);
(...skipping 14 matching lines...) Expand all
49 virtual void PostMainMessageLoopRun() OVERRIDE; 54 virtual void PostMainMessageLoopRun() OVERRIDE;
50 55
51 virtual void SetupPlatformFieldTrials() OVERRIDE; 56 virtual void SetupPlatformFieldTrials() OVERRIDE;
52 57
53 private: 58 private:
54 // Set up field trial for low memory headroom settings. 59 // Set up field trial for low memory headroom settings.
55 void SetupLowMemoryHeadroomFieldTrial(); 60 void SetupLowMemoryHeadroomFieldTrial();
56 61
57 scoped_ptr<contacts::ContactManager> contact_manager_; 62 scoped_ptr<contacts::ContactManager> contact_manager_;
58 scoped_ptr<chromeos::BrightnessObserver> brightness_observer_; 63 scoped_ptr<chromeos::BrightnessObserver> brightness_observer_;
64 scoped_ptr<chromeos::default_app_order::ExternalLoader> app_order_loader_;
59 scoped_ptr<chromeos::OutputObserver> output_observer_; 65 scoped_ptr<chromeos::OutputObserver> output_observer_;
60 scoped_ptr<chromeos::ResumeObserver> resume_observer_; 66 scoped_ptr<chromeos::ResumeObserver> resume_observer_;
61 scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_; 67 scoped_ptr<chromeos::ScreenLockObserver> screen_lock_observer_;
62 scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_; 68 scoped_ptr<chromeos::PowerButtonObserver> power_button_observer_;
63 scoped_ptr<chromeos::PowerStateOverride> power_state_override_; 69 scoped_ptr<chromeos::PowerStateOverride> power_state_override_;
64 scoped_ptr<chromeos::PrimaryDisplaySwitchObserver> 70 scoped_ptr<chromeos::PrimaryDisplaySwitchObserver>
65 primary_display_switch_observer_; 71 primary_display_switch_observer_;
66 scoped_ptr<chromeos::UserActivityNotifier> user_activity_notifier_; 72 scoped_ptr<chromeos::UserActivityNotifier> user_activity_notifier_;
67 scoped_ptr<chromeos::VideoActivityNotifier> video_activity_notifier_; 73 scoped_ptr<chromeos::VideoActivityNotifier> video_activity_notifier_;
68 scoped_ptr<chromeos::ScreenDimmingObserver> screen_dimming_observer_; 74 scoped_ptr<chromeos::ScreenDimmingObserver> screen_dimming_observer_;
69 scoped_refptr<chromeos::RemovableDeviceNotificationsCros> 75 scoped_refptr<chromeos::RemovableDeviceNotificationsCros>
70 removable_device_notifications_; 76 removable_device_notifications_;
71 77
72 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos); 78 DISALLOW_COPY_AND_ASSIGN(ChromeBrowserMainPartsChromeos);
73 }; 79 };
74 80
75 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_ 81 #endif // CHROME_BROWSER_CHROMEOS_CHROME_BROWSER_MAIN_CHROMEOS_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698