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

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

Issue 2909483003: Revert of Move RedirectChromeLogging to src/chromeos. (Closed)
Patch Set: Created 3 years, 7 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/BUILD.gn ('k') | chrome/browser/chromeos/logging.h » ('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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "chrome/browser/chromeos/events/event_rewriter_controller.h" 50 #include "chrome/browser/chromeos/events/event_rewriter_controller.h"
51 #include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h" 51 #include "chrome/browser/chromeos/events/event_rewriter_delegate_impl.h"
52 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h" 52 #include "chrome/browser/chromeos/events/keyboard_driven_event_rewriter.h"
53 #include "chrome/browser/chromeos/extensions/default_app_order.h" 53 #include "chrome/browser/chromeos/extensions/default_app_order.h"
54 #include "chrome/browser/chromeos/extensions/extension_volume_observer.h" 54 #include "chrome/browser/chromeos/extensions/extension_volume_observer.h"
55 #include "chrome/browser/chromeos/external_metrics.h" 55 #include "chrome/browser/chromeos/external_metrics.h"
56 #include "chrome/browser/chromeos/input_method/input_method_configuration.h" 56 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
57 #include "chrome/browser/chromeos/input_method/input_method_util.h" 57 #include "chrome/browser/chromeos/input_method/input_method_util.h"
58 #include "chrome/browser/chromeos/language_preferences.h" 58 #include "chrome/browser/chromeos/language_preferences.h"
59 #include "chrome/browser/chromeos/lock_screen_apps/state_controller.h" 59 #include "chrome/browser/chromeos/lock_screen_apps/state_controller.h"
60 #include "chrome/browser/chromeos/logging.h"
61 #include "chrome/browser/chromeos/login/helper.h" 60 #include "chrome/browser/chromeos/login/helper.h"
62 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 61 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
63 #include "chrome/browser/chromeos/login/login_wizard.h" 62 #include "chrome/browser/chromeos/login/login_wizard.h"
64 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h" 63 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h"
65 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 64 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
66 #include "chrome/browser/chromeos/login/startup_utils.h" 65 #include "chrome/browser/chromeos/login/startup_utils.h"
67 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 66 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
68 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 67 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
69 #include "chrome/browser/chromeos/login/wizard_controller.h" 68 #include "chrome/browser/chromeos/login/wizard_controller.h"
70 #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h" 69 #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h"
(...skipping 1058 matching lines...) Expand 10 before | Expand all | Expand 10 after
1129 // outlive CertLoader. 1128 // outlive CertLoader.
1130 system_token_certdb_initializer_.reset(); 1129 system_token_certdb_initializer_.reset();
1131 1130
1132 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 1131 ChromeBrowserMainPartsLinux::PostDestroyThreads();
1133 1132
1134 // Destroy DeviceSettingsService after g_browser_process. 1133 // Destroy DeviceSettingsService after g_browser_process.
1135 DeviceSettingsService::Shutdown(); 1134 DeviceSettingsService::Shutdown();
1136 } 1135 }
1137 1136
1138 } // namespace chromeos 1137 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/chromeos/BUILD.gn ('k') | chrome/browser/chromeos/logging.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698