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

Side by Side Diff: chrome/browser/chromeos/chrome_browser_main_chromeos.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
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/chromeos/chrome_browser_main_chromeos.h" 5 #include "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/callback.h" 8 #include "base/callback.h"
9 #include "base/chromeos/chromeos_version.h" 9 #include "base/chromeos/chromeos_version.h"
10 #include "base/command_line.h" 10 #include "base/command_line.h"
(...skipping 23 matching lines...) Expand all
34 #include "chrome/browser/chromeos/login/user_manager.h" 34 #include "chrome/browser/chromeos/login/user_manager.h"
35 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h" 35 #include "chrome/browser/chromeos/net/cros_network_change_notifier_factory.h"
36 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h" 36 #include "chrome/browser/chromeos/net/network_change_notifier_chromeos.h"
37 #include "chrome/browser/chromeos/power/brightness_observer.h" 37 #include "chrome/browser/chromeos/power/brightness_observer.h"
38 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo s.h" 38 #include "chrome/browser/chromeos/power/power_button_controller_delegate_chromeo s.h"
39 #include "chrome/browser/chromeos/power/power_button_observer.h" 39 #include "chrome/browser/chromeos/power/power_button_observer.h"
40 #include "chrome/browser/chromeos/power/power_state_override.h" 40 #include "chrome/browser/chromeos/power/power_state_override.h"
41 #include "chrome/browser/chromeos/power/resume_observer.h" 41 #include "chrome/browser/chromeos/power/resume_observer.h"
42 #include "chrome/browser/chromeos/power/screen_lock_observer.h" 42 #include "chrome/browser/chromeos/power/screen_lock_observer.h"
43 #include "chrome/browser/chromeos/power/video_property_writer.h" 43 #include "chrome/browser/chromeos/power/video_property_writer.h"
44 #include "chrome/browser/chromeos/status/status_area_view_chromeos.h"
45 #include "chrome/browser/chromeos/system/statistics_provider.h" 44 #include "chrome/browser/chromeos/system/statistics_provider.h"
46 #include "chrome/browser/chromeos/system_key_event_listener.h" 45 #include "chrome/browser/chromeos/system_key_event_listener.h"
47 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h" 46 #include "chrome/browser/chromeos/upgrade_detector_chromeos.h"
48 #include "chrome/browser/chromeos/web_socket_proxy_controller.h" 47 #include "chrome/browser/chromeos/web_socket_proxy_controller.h"
49 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h" 48 #include "chrome/browser/chromeos/xinput_hierarchy_changed_event_listener.h"
50 #include "chrome/browser/defaults.h" 49 #include "chrome/browser/defaults.h"
51 #include "chrome/browser/metrics/metrics_service.h" 50 #include "chrome/browser/metrics/metrics_service.h"
52 #include "chrome/browser/oom_priority_manager.h" 51 #include "chrome/browser/oom_priority_manager.h"
53 #include "chrome/browser/policy/browser_policy_connector.h" 52 #include "chrome/browser/policy/browser_policy_connector.h"
54 #include "chrome/browser/prefs/pref_service.h" 53 #include "chrome/browser/prefs/pref_service.h"
(...skipping 296 matching lines...) Expand 10 before | Expand all | Expand 10 after
351 logging::RedirectChromeLogging(parsed_command_line()); 350 logging::RedirectChromeLogging(parsed_command_line());
352 351
353 // Initialize user policy before creating the profile so the profile 352 // Initialize user policy before creating the profile so the profile
354 // initialization code sees policy settings. 353 // initialization code sees policy settings.
355 g_browser_process->browser_policy_connector()->InitializeUserPolicy( 354 g_browser_process->browser_policy_connector()->InitializeUserPolicy(
356 username, false /* wait_for_policy_fetch */); 355 username, false /* wait_for_policy_fetch */);
357 content::NotificationService::current()->Notify( 356 content::NotificationService::current()->Notify(
358 chrome::NOTIFICATION_SESSION_STARTED, 357 chrome::NOTIFICATION_SESSION_STARTED,
359 content::NotificationService::AllSources(), 358 content::NotificationService::AllSources(),
360 content::NotificationService::NoDetails()); 359 content::NotificationService::NoDetails());
361 } else if (parsed_command_line().HasSwitch(switches::kLoginManager)) {
362 // Initialize status area mode early on.
363 chromeos::StatusAreaViewChromeos::
364 SetScreenMode(chromeos::StatusAreaViewChromeos::LOGIN_MODE_WEBUI);
365 } 360 }
366 361
367 // In Aura builds this will initialize ash::Shell. 362 // In Aura builds this will initialize ash::Shell.
368 ChromeBrowserMainPartsLinux::PreProfileInit(); 363 ChromeBrowserMainPartsLinux::PreProfileInit();
369 364
370 // Initialize desktop background observer so that it can receive 365 // Initialize desktop background observer so that it can receive
371 // LOGIN_USER_CHANGED notification from UserManager. 366 // LOGIN_USER_CHANGED notification from UserManager.
372 desktop_background_observer_.reset(new chromeos::DesktopBackgroundObserver); 367 desktop_background_observer_.reset(new chromeos::DesktopBackgroundObserver);
373 } 368 }
374 369
(...skipping 117 matching lines...) Expand 10 before | Expand all | Expand 10 after
492 487
493 // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell 488 // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell
494 // singleton before the shell is destroyed. 489 // singleton before the shell is destroyed.
495 video_property_writer_.reset(); 490 video_property_writer_.reset();
496 // Remove PowerButtonObserver attached to a D-Bus client before 491 // Remove PowerButtonObserver attached to a D-Bus client before
497 // DBusThreadManager is shut down. 492 // DBusThreadManager is shut down.
498 power_button_observer_.reset(); 493 power_button_observer_.reset();
499 494
500 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun(); 495 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
501 } 496 }
OLDNEW
« no previous file with comments | « chrome/browser/chrome_browser_main_extra_parts_ash.cc ('k') | chrome/browser/chromeos/input_method/input_method_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698