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

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

Issue 2901173002: Move RedirectChromeLogging to src/chromeos. (Closed)
Patch Set: Using blocking pool Created 3 years, 6 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
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"
60 #include "chrome/browser/chromeos/login/helper.h" 61 #include "chrome/browser/chromeos/login/helper.h"
61 #include "chrome/browser/chromeos/login/lock/screen_locker.h" 62 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
62 #include "chrome/browser/chromeos/login/login_wizard.h" 63 #include "chrome/browser/chromeos/login/login_wizard.h"
63 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h" 64 #include "chrome/browser/chromeos/login/session/chrome_session_manager.h"
64 #include "chrome/browser/chromeos/login/session/user_session_manager.h" 65 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
65 #include "chrome/browser/chromeos/login/startup_utils.h" 66 #include "chrome/browser/chromeos/login/startup_utils.h"
66 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h" 67 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
67 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h" 68 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
68 #include "chrome/browser/chromeos/login/wizard_controller.h" 69 #include "chrome/browser/chromeos/login/wizard_controller.h"
69 #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h" 70 #include "chrome/browser/chromeos/net/network_connect_delegate_chromeos.h"
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after
662 663
663 // ProfileHelper has to be initialized after UserManager instance is created. 664 // ProfileHelper has to be initialized after UserManager instance is created.
664 ProfileHelper::Get()->Initialize(); 665 ProfileHelper::Get()->Initialize();
665 666
666 // If kLoginUser is passed this indicates that user has already 667 // If kLoginUser is passed this indicates that user has already
667 // logged in and we should behave accordingly. 668 // logged in and we should behave accordingly.
668 bool immediate_login = 669 bool immediate_login =
669 parsed_command_line().HasSwitch(switches::kLoginUser); 670 parsed_command_line().HasSwitch(switches::kLoginUser);
670 if (immediate_login) { 671 if (immediate_login) {
671 // Redirects Chrome logging to the user data dir. 672 // Redirects Chrome logging to the user data dir.
672 logging::RedirectChromeLogging(parsed_command_line()); 673 logging::RedirectChromeLogging(parsed_command_line());
xiyuan 2017/05/31 15:32:22 This call runs on crash-n-restart case. Would it t
achuithb 2017/05/31 23:42:45 Done.
673 674
674 // Load the default app order synchronously for restarting case. 675 // Load the default app order synchronously for restarting case.
675 app_order_loader_.reset( 676 app_order_loader_.reset(
676 new default_app_order::ExternalLoader(false /* async */)); 677 new default_app_order::ExternalLoader(false /* async */));
677 } 678 }
678 679
679 if (!app_order_loader_) { 680 if (!app_order_loader_) {
680 app_order_loader_.reset( 681 app_order_loader_.reset(
681 new default_app_order::ExternalLoader(true /* async */)); 682 new default_app_order::ExternalLoader(true /* async */));
682 } 683 }
(...skipping 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
1128 // outlive CertLoader. 1129 // outlive CertLoader.
1129 system_token_certdb_initializer_.reset(); 1130 system_token_certdb_initializer_.reset();
1130 1131
1131 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 1132 ChromeBrowserMainPartsLinux::PostDestroyThreads();
1132 1133
1133 // Destroy DeviceSettingsService after g_browser_process. 1134 // Destroy DeviceSettingsService after g_browser_process.
1134 DeviceSettingsService::Shutdown(); 1135 DeviceSettingsService::Shutdown();
1135 } 1136 }
1136 1137
1137 } // namespace chromeos 1138 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698