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

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

Issue 303233004: Write "logout-started" event on next boot. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rename variable. Created 6 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 <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "ash/ash_switches.h" 10 #include "ash/ash_switches.h"
(...skipping 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 new locale_util::SwitchLanguageCallback(base::Bind( 606 new locale_util::SwitchLanguageCallback(base::Bind(
607 &GuestLanguageSetCallbackData::Callback, base::Passed(data.Pass())))); 607 &GuestLanguageSetCallbackData::Callback, base::Passed(data.Pass()))));
608 User* const user = usermanager->GetUserByProfile(profile); 608 User* const user = usermanager->GetUserByProfile(profile);
609 usermanager->RespectLocalePreference(profile, user, callback.Pass()); 609 usermanager->RespectLocalePreference(profile, user, callback.Pass());
610 } 610 }
611 611
612 void ChromeBrowserMainPartsChromeos::PostProfileInit() { 612 void ChromeBrowserMainPartsChromeos::PostProfileInit() {
613 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun() 613 // -- This used to be in ChromeBrowserMainParts::PreMainMessageLoopRun()
614 // -- just after CreateProfile(). 614 // -- just after CreateProfile().
615 615
616 BootTimesLoader::Get()->OnBoot();
Nikita (slow) 2014/05/30 07:07:03 nit: empty line after that line.
Alexander Alekseev 2014/05/30 18:44:54 Done.
616 // Restarting Chrome inside existing user session. Possible cases: 617 // Restarting Chrome inside existing user session. Possible cases:
617 // 1. Chrome is restarted after crash. 618 // 1. Chrome is restarted after crash.
618 // 2. Chrome is started in browser_tests skipping the login flow 619 // 2. Chrome is started in browser_tests skipping the login flow
619 // 3. Chrome is started on dev machine 620 // 3. Chrome is started on dev machine
620 // i.e. not on Chrome OS device w/o login flow. 621 // i.e. not on Chrome OS device w/o login flow.
621 if (parsed_command_line().HasSwitch(switches::kLoginUser) && 622 if (parsed_command_line().HasSwitch(switches::kLoginUser) &&
622 !parsed_command_line().HasSwitch(switches::kLoginPassword)) { 623 !parsed_command_line().HasSwitch(switches::kLoginPassword)) {
623 std::string login_user = login::CanonicalizeUserID( 624 std::string login_user = login::CanonicalizeUserID(
624 parsed_command_line().GetSwitchValueASCII( 625 parsed_command_line().GetSwitchValueASCII(
625 chromeos::switches::kLoginUser)); 626 chromeos::switches::kLoginUser));
(...skipping 237 matching lines...) Expand 10 before | Expand all | Expand 10 after
863 // Destroy DBus services immediately after threads are stopped. 864 // Destroy DBus services immediately after threads are stopped.
864 dbus_services_.reset(); 865 dbus_services_.reset();
865 866
866 ChromeBrowserMainPartsLinux::PostDestroyThreads(); 867 ChromeBrowserMainPartsLinux::PostDestroyThreads();
867 868
868 // Destroy DeviceSettingsService after g_browser_process. 869 // Destroy DeviceSettingsService after g_browser_process.
869 DeviceSettingsService::Shutdown(); 870 DeviceSettingsService::Shutdown();
870 } 871 }
871 872
872 } // namespace chromeos 873 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698