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

Side by Side Diff: chrome/browser/chrome_browser_main_extra_parts_ash.cc

Issue 10024013: chromeos: Add support for the battery status API on chromeos. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years, 8 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 #include "chrome/browser/chrome_browser_main_extra_parts_ash.h" 5 #include "chrome/browser/chrome_browser_main_extra_parts_ash.h"
6 6
7 #include "ash/accelerators/accelerator_controller.h" 7 #include "ash/accelerators/accelerator_controller.h"
8 #include "ash/ash_switches.h" 8 #include "ash/ash_switches.h"
9 #include "ash/shell.h" 9 #include "ash/shell.h"
10 #include "ash/wm/key_rewriter_event_filter.h" 10 #include "ash/wm/key_rewriter_event_filter.h"
11 #include "ash/wm/property_util.h" 11 #include "ash/wm/property_util.h"
12 #include "base/command_line.h" 12 #include "base/command_line.h"
13 #include "chrome/common/chrome_switches.h" 13 #include "chrome/common/chrome_switches.h"
14 #include "chrome/browser/ui/browser_list.h" 14 #include "chrome/browser/ui/browser_list.h"
15 #include "chrome/browser/ui/views/ash/caps_lock_handler.h" 15 #include "chrome/browser/ui/views/ash/caps_lock_handler.h"
16 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" 16 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
17 #include "chrome/browser/ui/views/ash/key_rewriter.h" 17 #include "chrome/browser/ui/views/ash/key_rewriter.h"
18 #include "chrome/browser/ui/views/ash/screen_orientation_listener.h" 18 #include "chrome/browser/ui/views/ash/screen_orientation_listener.h"
19 #include "chrome/browser/ui/views/ash/screenshot_taker.h" 19 #include "chrome/browser/ui/views/ash/screenshot_taker.h"
20 #include "ui/aura/env.h" 20 #include "ui/aura/env.h"
21 #include "ui/aura/aura_switches.h" 21 #include "ui/aura/aura_switches.h"
22 #include "ui/aura/monitor_manager.h" 22 #include "ui/aura/monitor_manager.h"
23 #include "ui/aura/root_window.h" 23 #include "ui/aura/root_window.h"
24 #include "ui/gfx/compositor/compositor_setup.h" 24 #include "ui/gfx/compositor/compositor_setup.h"
25 25
26 #if defined(OS_CHROMEOS) 26 #if defined(OS_CHROMEOS)
27 #include "base/chromeos/chromeos_version.h" 27 #include "base/chromeos/chromeos_version.h"
28 #include "chrome/browser/chromeos/battery_status_provider_chromeos.h"
28 #include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h" 29 #include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h"
29 #include "chrome/browser/ui/views/ash/ime_controller_chromeos.h" 30 #include "chrome/browser/ui/views/ash/ime_controller_chromeos.h"
30 #include "chrome/browser/ui/views/ash/volume_controller_chromeos.h" 31 #include "chrome/browser/ui/views/ash/volume_controller_chromeos.h"
31 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 32 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
32 #include "chrome/browser/chromeos/login/user_manager.h" 33 #include "chrome/browser/chromeos/login/user_manager.h"
33 #endif 34 #endif
34 35
35 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh() 36 ChromeBrowserMainExtraPartsAsh::ChromeBrowserMainExtraPartsAsh()
36 : ChromeBrowserMainExtraParts() { 37 : ChromeBrowserMainExtraParts() {
37 } 38 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
72 shell->accelerator_controller()->SetVolumeControlDelegate( 73 shell->accelerator_controller()->SetVolumeControlDelegate(
73 scoped_ptr<ash::VolumeControlDelegate>(new VolumeController).Pass()); 74 scoped_ptr<ash::VolumeControlDelegate>(new VolumeController).Pass());
74 75
75 if (!CommandLine::ForCurrentProcess()->HasSwitch( 76 if (!CommandLine::ForCurrentProcess()->HasSwitch(
76 switches::kDisableZeroBrowsersOpenForTests)) 77 switches::kDisableZeroBrowsersOpenForTests))
77 BrowserList::StartKeepAlive(); 78 BrowserList::StartKeepAlive();
78 #endif 79 #endif
79 80
80 // Make sure the singleton ScreenOrientationListener object is created. 81 // Make sure the singleton ScreenOrientationListener object is created.
81 ScreenOrientationListener::GetInstance(); 82 ScreenOrientationListener::GetInstance();
83
84 #if defined(OS_CHROMEOS)
85 // Make sure the singleton BatteryStatusProviderChromeos object is created.
86 BatteryStatusProviderChromeos::GetInstance();
87 #endif
82 } 88 }
83 89
84 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { 90 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
85 } 91 }
86 92
87 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 93 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
88 ash::Shell::DeleteInstance(); 94 ash::Shell::DeleteInstance();
89 } 95 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698