OLD | NEW |
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 1518 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1529 } else { | 1529 } else { |
1530 run_message_loop_ = false; | 1530 run_message_loop_ = false; |
1531 } | 1531 } |
1532 browser_creator_.reset(); | 1532 browser_creator_.reset(); |
1533 #endif // !defined(OS_ANDROID) | 1533 #endif // !defined(OS_ANDROID) |
1534 | 1534 |
1535 performance_monitor::PerformanceMonitor::GetInstance()->Initialize(); | 1535 performance_monitor::PerformanceMonitor::GetInstance()->Initialize(); |
1536 | 1536 |
1537 PostBrowserStart(); | 1537 PostBrowserStart(); |
1538 | 1538 |
1539 chrome_prefs::SchedulePrefHashStoresUpdateCheck(profile_->GetPath()); | |
1540 | |
1541 if (parameters().ui_task) { | 1539 if (parameters().ui_task) { |
1542 // We end the startup timer here if we have parameters to run, because we | 1540 // We end the startup timer here if we have parameters to run, because we |
1543 // never start to run the main loop (where we normally stop the timer). | 1541 // never start to run the main loop (where we normally stop the timer). |
1544 startup_timer_->SignalStartupComplete( | 1542 startup_timer_->SignalStartupComplete( |
1545 performance_monitor::StartupTimer::STARTUP_TEST); | 1543 performance_monitor::StartupTimer::STARTUP_TEST); |
1546 parameters().ui_task->Run(); | 1544 parameters().ui_task->Run(); |
1547 delete parameters().ui_task; | 1545 delete parameters().ui_task; |
1548 run_message_loop_ = false; | 1546 run_message_loop_ = false; |
1549 } | 1547 } |
1550 #if defined(OS_ANDROID) | 1548 #if defined(OS_ANDROID) |
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1654 chromeos::CrosSettings::Shutdown(); | 1652 chromeos::CrosSettings::Shutdown(); |
1655 #endif | 1653 #endif |
1656 #endif | 1654 #endif |
1657 } | 1655 } |
1658 | 1656 |
1659 // Public members: | 1657 // Public members: |
1660 | 1658 |
1661 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1659 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1662 chrome_extra_parts_.push_back(parts); | 1660 chrome_extra_parts_.push_back(parts); |
1663 } | 1661 } |
OLD | NEW |