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 1779 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1790 shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(300)); | 1790 shutdown_watcher_->Arm(base::TimeDelta::FromSeconds(300)); |
1791 | 1791 |
1792 // Disarm the startup hang detector time bomb if it is still Arm'ed. | 1792 // Disarm the startup hang detector time bomb if it is still Arm'ed. |
1793 startup_watcher_->Disarm(); | 1793 startup_watcher_->Disarm(); |
1794 | 1794 |
1795 // Remove observers attached to D-Bus clients before DbusThreadManager is | 1795 // Remove observers attached to D-Bus clients before DbusThreadManager is |
1796 // shut down. | 1796 // shut down. |
1797 process_power_collector_.reset(); | 1797 process_power_collector_.reset(); |
1798 | 1798 |
1799 #if !defined(OS_IOS) | 1799 #if !defined(OS_IOS) |
| 1800 webusb_detector_.reset(); |
1800 webusb_browser_client_.reset(); | 1801 webusb_browser_client_.reset(); |
1801 webusb_detector_.reset(); | |
1802 #endif | 1802 #endif |
1803 | 1803 |
1804 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) | 1804 for (size_t i = 0; i < chrome_extra_parts_.size(); ++i) |
1805 chrome_extra_parts_[i]->PostMainMessageLoopRun(); | 1805 chrome_extra_parts_[i]->PostMainMessageLoopRun(); |
1806 | 1806 |
1807 // Some tests don't set parameters.ui_task, so they started translate | 1807 // Some tests don't set parameters.ui_task, so they started translate |
1808 // language fetch that was never completed so we need to cleanup here | 1808 // language fetch that was never completed so we need to cleanup here |
1809 // otherwise it will be done by the destructor in a wrong thread. | 1809 // otherwise it will be done by the destructor in a wrong thread. |
1810 TranslateService::Shutdown(parameters().ui_task == NULL); | 1810 TranslateService::Shutdown(parameters().ui_task == NULL); |
1811 | 1811 |
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1848 chromeos::CrosSettings::Shutdown(); | 1848 chromeos::CrosSettings::Shutdown(); |
1849 #endif // defined(OS_CHROMEOS) | 1849 #endif // defined(OS_CHROMEOS) |
1850 #endif // defined(OS_ANDROID) | 1850 #endif // defined(OS_ANDROID) |
1851 } | 1851 } |
1852 | 1852 |
1853 // Public members: | 1853 // Public members: |
1854 | 1854 |
1855 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { | 1855 void ChromeBrowserMainParts::AddParts(ChromeBrowserMainExtraParts* parts) { |
1856 chrome_extra_parts_.push_back(parts); | 1856 chrome_extra_parts_.push_back(parts); |
1857 } | 1857 } |
OLD | NEW |