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

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

Issue 10056001: chromeos: Remove old status-area related code. (Closed) 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
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | 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 #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 "base/command_line.h" 11 #include "base/command_line.h"
12 #include "chrome/common/chrome_switches.h" 12 #include "chrome/common/chrome_switches.h"
13 #include "chrome/browser/ui/browser_list.h" 13 #include "chrome/browser/ui/browser_list.h"
14 #include "chrome/browser/ui/views/ash/caps_lock_handler.h" 14 #include "chrome/browser/ui/views/ash/caps_lock_handler.h"
15 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h" 15 #include "chrome/browser/ui/views/ash/chrome_shell_delegate.h"
16 #include "chrome/browser/ui/views/ash/key_rewriter.h" 16 #include "chrome/browser/ui/views/ash/key_rewriter.h"
17 #include "chrome/browser/ui/views/ash/screen_orientation_listener.h" 17 #include "chrome/browser/ui/views/ash/screen_orientation_listener.h"
18 #include "chrome/browser/ui/views/ash/screenshot_taker.h" 18 #include "chrome/browser/ui/views/ash/screenshot_taker.h"
19 #include "chrome/browser/ui/views/ash/status_area_host_aura.h"
20 #include "ui/aura/env.h" 19 #include "ui/aura/env.h"
21 #include "ui/aura/aura_switches.h" 20 #include "ui/aura/aura_switches.h"
22 #include "ui/aura/monitor_manager.h" 21 #include "ui/aura/monitor_manager.h"
23 #include "ui/aura/root_window.h" 22 #include "ui/aura/root_window.h"
24 #include "ui/gfx/compositor/compositor_setup.h" 23 #include "ui/gfx/compositor/compositor_setup.h"
25 24
26 #if defined(OS_CHROMEOS) 25 #if defined(OS_CHROMEOS)
27 #include "base/chromeos/chromeos_version.h" 26 #include "base/chromeos/chromeos_version.h"
28 #include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h" 27 #include "chrome/browser/ui/views/ash/brightness_controller_chromeos.h"
29 #include "chrome/browser/ui/views/ash/ime_controller_chromeos.h" 28 #include "chrome/browser/ui/views/ash/ime_controller_chromeos.h"
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 if (!CommandLine::ForCurrentProcess()->HasSwitch( 70 if (!CommandLine::ForCurrentProcess()->HasSwitch(
72 switches::kDisableZeroBrowsersOpenForTests)) 71 switches::kDisableZeroBrowsersOpenForTests))
73 BrowserList::StartKeepAlive(); 72 BrowserList::StartKeepAlive();
74 #endif 73 #endif
75 74
76 // Make sure the singleton ScreenOrientationListener object is created. 75 // Make sure the singleton ScreenOrientationListener object is created.
77 ScreenOrientationListener::GetInstance(); 76 ScreenOrientationListener::GetInstance();
78 } 77 }
79 78
80 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() { 79 void ChromeBrowserMainExtraPartsAsh::PostProfileInit() {
81 // Add the status area buttons after Profile has been initialized.
82 if (CommandLine::ForCurrentProcess()->HasSwitch(
83 ash::switches::kDisableAshUberTray)) {
84 ChromeShellDelegate::instance()->status_area_host()->AddButtons();
85 }
86 } 80 }
87 81
88 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() { 82 void ChromeBrowserMainExtraPartsAsh::PostMainMessageLoopRun() {
89 ash::Shell::DeleteInstance(); 83 ash::Shell::DeleteInstance();
90 } 84 }
OLDNEW
« no previous file with comments | « chrome/browser/about_flags.cc ('k') | chrome/browser/chromeos/chrome_browser_main_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698