OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser_about_handler.h" | 5 #include "chrome/browser/browser_about_handler.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 #include <string> | 8 #include <string> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 12 matching lines...) Expand all Loading... |
23 #include "base/stringprintf.h" | 23 #include "base/stringprintf.h" |
24 #include "base/threading/thread.h" | 24 #include "base/threading/thread.h" |
25 #include "base/tracked_objects.h" | 25 #include "base/tracked_objects.h" |
26 #include "base/utf_string_conversions.h" | 26 #include "base/utf_string_conversions.h" |
27 #include "base/values.h" | 27 #include "base/values.h" |
28 #include "chrome/browser/about_flags.h" | 28 #include "chrome/browser/about_flags.h" |
29 #include "chrome/browser/browser_process.h" | 29 #include "chrome/browser/browser_process.h" |
30 #include "chrome/browser/defaults.h" | 30 #include "chrome/browser/defaults.h" |
31 #include "chrome/browser/memory_details.h" | 31 #include "chrome/browser/memory_details.h" |
32 #include "chrome/browser/metrics/histogram_synchronizer.h" | 32 #include "chrome/browser/metrics/histogram_synchronizer.h" |
33 #include "chrome/browser/net/predictor_api.h" | 33 #include "chrome/browser/net/predictor.h" |
34 #include "chrome/browser/net/url_fixer_upper.h" | 34 #include "chrome/browser/net/url_fixer_upper.h" |
35 #include "chrome/browser/profiles/profile.h" | 35 #include "chrome/browser/profiles/profile.h" |
36 #include "chrome/browser/profiles/profile_manager.h" | 36 #include "chrome/browser/profiles/profile_manager.h" |
37 #include "chrome/browser/ui/browser_dialogs.h" | 37 #include "chrome/browser/ui/browser_dialogs.h" |
38 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" | 38 #include "chrome/browser/ui/webui/chrome_url_data_manager.h" |
39 #include "chrome/common/about_handler.h" | 39 #include "chrome/common/about_handler.h" |
40 #include "chrome/common/chrome_paths.h" | 40 #include "chrome/common/chrome_paths.h" |
41 #include "chrome/common/chrome_version_info.h" | 41 #include "chrome/common/chrome_version_info.h" |
42 #include "chrome/common/jstemplate_builder.h" | 42 #include "chrome/common/jstemplate_builder.h" |
43 #include "chrome/common/net/gaia/google_service_auth_error.h" | 43 #include "chrome/common/net/gaia/google_service_auth_error.h" |
(...skipping 662 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
706 BrowserThread::IO, FROM_HERE, | 706 BrowserThread::IO, FROM_HERE, |
707 NewRunnableMethod(this, &AboutDnsHandler::StartOnIOThread)); | 707 NewRunnableMethod(this, &AboutDnsHandler::StartOnIOThread)); |
708 } | 708 } |
709 | 709 |
710 void StartOnIOThread() { | 710 void StartOnIOThread() { |
711 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); | 711 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO)); |
712 | 712 |
713 std::string data; | 713 std::string data; |
714 AppendHeader(&data, 0, "About DNS"); | 714 AppendHeader(&data, 0, "About DNS"); |
715 AppendBody(&data); | 715 AppendBody(&data); |
716 chrome_browser_net::PredictorGetHtmlInfo(&data); | 716 source_->profile()->PredictorGetHtmlInfo(&data); |
717 AppendFooter(&data); | 717 AppendFooter(&data); |
718 | 718 |
719 BrowserThread::PostTask( | 719 BrowserThread::PostTask( |
720 BrowserThread::UI, FROM_HERE, | 720 BrowserThread::UI, FROM_HERE, |
721 NewRunnableMethod(this, &AboutDnsHandler::FinishOnUIThread, data)); | 721 NewRunnableMethod(this, &AboutDnsHandler::FinishOnUIThread, data)); |
722 } | 722 } |
723 | 723 |
724 void FinishOnUIThread(const std::string& data) { | 724 void FinishOnUIThread(const std::string& data) { |
725 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); | 725 DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI)); |
726 source_->FinishDataRequest(data, request_id_); | 726 source_->FinishDataRequest(data, request_id_); |
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1525 return false; | 1525 return false; |
1526 } | 1526 } |
1527 | 1527 |
1528 std::vector<std::string> ChromePaths() { | 1528 std::vector<std::string> ChromePaths() { |
1529 std::vector<std::string> paths; | 1529 std::vector<std::string> paths; |
1530 paths.reserve(arraysize(kChromePaths)); | 1530 paths.reserve(arraysize(kChromePaths)); |
1531 for (size_t i = 0; i < arraysize(kChromePaths); i++) | 1531 for (size_t i = 0; i < arraysize(kChromePaths); i++) |
1532 paths.push_back(kChromePaths[i]); | 1532 paths.push_back(kChromePaths[i]); |
1533 return paths; | 1533 return paths; |
1534 } | 1534 } |
OLD | NEW |