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

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 9838085: Move files inside chrome/browser/chromeos/dbus to chromeos/dbus (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Rebase 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
« no previous file with comments | « chrome/browser/chromeos/bluetooth/bluetooth_device.cc ('k') | chrome/browser/chromeos/cros/burn_library.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/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"
11 #include "base/lazy_instance.h" 11 #include "base/lazy_instance.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "base/string_number_conversions.h" 13 #include "base/string_number_conversions.h"
14 #include "chrome/browser/browser_process_impl.h" 14 #include "chrome/browser/browser_process_impl.h"
15 #include "chrome/browser/chromeos/audio/audio_handler.h"
15 #include "chrome/browser/chromeos/background/desktop_background_observer.h" 16 #include "chrome/browser/chromeos/background/desktop_background_observer.h"
16 #include "chrome/browser/chromeos/audio/audio_handler.h"
17 #include "chrome/browser/chromeos/boot_times_loader.h" 17 #include "chrome/browser/chromeos/boot_times_loader.h"
18 #include "chrome/browser/chromeos/cros/cros_library.h" 18 #include "chrome/browser/chromeos/cros/cros_library.h"
19 #include "chrome/browser/chromeos/cryptohome/async_method_caller.h" 19 #include "chrome/browser/chromeos/cryptohome/async_method_caller.h"
20 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h" 20 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
21 #include "chrome/browser/chromeos/dbus/dbus_thread_manager.h"
22 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
23 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
24 #include "chrome/browser/chromeos/disks/disk_mount_manager.h" 21 #include "chrome/browser/chromeos/disks/disk_mount_manager.h"
25 #include "chrome/browser/chromeos/external_metrics.h" 22 #include "chrome/browser/chromeos/external_metrics.h"
26 #include "chrome/browser/chromeos/imageburner/burn_manager.h" 23 #include "chrome/browser/chromeos/imageburner/burn_manager.h"
27 #include "chrome/browser/chromeos/input_method/input_method_manager.h" 24 #include "chrome/browser/chromeos/input_method/input_method_manager.h"
28 #include "chrome/browser/chromeos/input_method/xkeyboard.h" 25 #include "chrome/browser/chromeos/input_method/xkeyboard.h"
29 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h" 26 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_idle_logout.h"
30 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h" 27 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_screensaver.h"
31 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h" 28 #include "chrome/browser/chromeos/kiosk_mode/kiosk_mode_settings.h"
32 #include "chrome/browser/chromeos/legacy_window_manager/initial_browser_window_o bserver.h" 29 #include "chrome/browser/chromeos/legacy_window_manager/initial_browser_window_o bserver.h"
33 #include "chrome/browser/chromeos/login/authenticator.h" 30 #include "chrome/browser/chromeos/login/authenticator.h"
(...skipping 23 matching lines...) Expand all
57 #include "chrome/browser/policy/browser_policy_connector.h" 54 #include "chrome/browser/policy/browser_policy_connector.h"
58 #include "chrome/browser/prefs/pref_service.h" 55 #include "chrome/browser/prefs/pref_service.h"
59 #include "chrome/browser/profiles/profile.h" 56 #include "chrome/browser/profiles/profile.h"
60 #include "chrome/browser/profiles/profile_manager.h" 57 #include "chrome/browser/profiles/profile_manager.h"
61 #include "chrome/browser/signin/token_service_factory.h" 58 #include "chrome/browser/signin/token_service_factory.h"
62 #include "chrome/browser/ui/views/browser_dialogs.h" 59 #include "chrome/browser/ui/views/browser_dialogs.h"
63 #include "chrome/common/chrome_notification_types.h" 60 #include "chrome/common/chrome_notification_types.h"
64 #include "chrome/common/chrome_switches.h" 61 #include "chrome/common/chrome_switches.h"
65 #include "chrome/common/logging_chrome.h" 62 #include "chrome/common/logging_chrome.h"
66 #include "chrome/common/pref_names.h" 63 #include "chrome/common/pref_names.h"
64 #include "chromeos/dbus/dbus_thread_manager.h"
65 #include "chromeos/dbus/power_manager_client.h"
66 #include "chromeos/dbus/session_manager_client.h"
67 #include "content/public/browser/notification_service.h" 67 #include "content/public/browser/notification_service.h"
68 #include "content/public/common/main_function_params.h" 68 #include "content/public/common/main_function_params.h"
69 #include "grit/platform_locale_settings.h" 69 #include "grit/platform_locale_settings.h"
70 #include "net/base/network_change_notifier.h" 70 #include "net/base/network_change_notifier.h"
71 #include "net/url_request/url_request.h" 71 #include "net/url_request/url_request.h"
72 #include "ui/base/l10n/l10n_util.h" 72 #include "ui/base/l10n/l10n_util.h"
73 73
74 74
75 75
76 class MessageLoopObserver : public MessageLoopForUI::Observer { 76 class MessageLoopObserver : public MessageLoopForUI::Observer {
(...skipping 418 matching lines...) Expand 10 before | Expand all | Expand 10 after
495 495
496 // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell 496 // Let VideoPropertyWriter unregister itself as an observer of the ash::Shell
497 // singleton before the shell is destroyed. 497 // singleton before the shell is destroyed.
498 video_property_writer_.reset(); 498 video_property_writer_.reset();
499 // Remove PowerButtonObserver attached to a D-Bus client before 499 // Remove PowerButtonObserver attached to a D-Bus client before
500 // DBusThreadManager is shut down. 500 // DBusThreadManager is shut down.
501 power_button_observer_.reset(); 501 power_button_observer_.reset();
502 502
503 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun(); 503 ChromeBrowserMainPartsLinux::PostMainMessageLoopRun();
504 } 504 }
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/bluetooth/bluetooth_device.cc ('k') | chrome/browser/chromeos/cros/burn_library.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698