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

Side by Side Diff: chrome/browser/chrome_browser_main.cc

Issue 324493002: Move preference MACs to the protected preference stores. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Pull some stuff from Persistent to WriteablePrefStore. 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 | 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/chrome_browser_main.h" 5 #include "chrome/browser/chrome_browser_main.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 #include <vector> 9 #include <vector>
10 10
(...skipping 1517 matching lines...) Expand 10 before | Expand all | Expand 10 after
1528 } else { 1528 } else {
1529 run_message_loop_ = false; 1529 run_message_loop_ = false;
1530 } 1530 }
1531 browser_creator_.reset(); 1531 browser_creator_.reset();
1532 #endif // !defined(OS_ANDROID) 1532 #endif // !defined(OS_ANDROID)
1533 1533
1534 performance_monitor::PerformanceMonitor::GetInstance()->Initialize(); 1534 performance_monitor::PerformanceMonitor::GetInstance()->Initialize();
1535 1535
1536 PostBrowserStart(); 1536 PostBrowserStart();
1537 1537
1538 chrome_prefs::SchedulePrefHashStoresUpdateCheck(profile_->GetPath());
1539
1540 if (parameters().ui_task) { 1538 if (parameters().ui_task) {
1541 // We end the startup timer here if we have parameters to run, because we 1539 // We end the startup timer here if we have parameters to run, because we
1542 // never start to run the main loop (where we normally stop the timer). 1540 // never start to run the main loop (where we normally stop the timer).
1543 startup_timer_->SignalStartupComplete( 1541 startup_timer_->SignalStartupComplete(
1544 performance_monitor::StartupTimer::STARTUP_TEST); 1542 performance_monitor::StartupTimer::STARTUP_TEST);
1545 parameters().ui_task->Run(); 1543 parameters().ui_task->Run();
1546 delete parameters().ui_task; 1544 delete parameters().ui_task;
1547 run_message_loop_ = false; 1545 run_message_loop_ = false;
1548 } 1546 }
1549 #if defined(OS_ANDROID) 1547 #if defined(OS_ANDROID)
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
1653 chromeos::CrosSettings::Shutdown(); 1651 chromeos::CrosSettings::Shutdown();
1654 #endif 1652 #endif
1655 #endif 1653 #endif
1656 } 1654 }
1657 1655
1658 // Public members: 1656 // Public members:
1659 1657
1660 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { 1658 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) {
1661 chrome_extra_parts_.push_back(parts); 1659 chrome_extra_parts_.push_back(parts);
1662 } 1660 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698