summaryrefslogtreecommitdiffstats
path: root/chrome/browser
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser')
-rw-r--r--chrome/browser/appcache/view_appcache_internals_job_factory.cc1
-rw-r--r--chrome/browser/browser_process.cc4
-rw-r--r--chrome/browser/browser_process.h4
-rw-r--r--chrome/browser/debugger/devtools_netlog_observer.cc1
-rw-r--r--chrome/browser/history/history_types.cc27
-rw-r--r--chrome/browser/history/history_types.h6
-rw-r--r--chrome/browser/history/top_sites.cc18
-rw-r--r--chrome/browser/history/top_sites_unittest.cc6
-rw-r--r--chrome/browser/io_thread.cc5
-rw-r--r--chrome/browser/io_thread.h7
-rw-r--r--chrome/browser/net/view_blob_internals_job_factory.cc1
11 files changed, 54 insertions, 26 deletions
diff --git a/chrome/browser/appcache/view_appcache_internals_job_factory.cc b/chrome/browser/appcache/view_appcache_internals_job_factory.cc
index 3f908af..6bd384d 100644
--- a/chrome/browser/appcache/view_appcache_internals_job_factory.cc
+++ b/chrome/browser/appcache/view_appcache_internals_job_factory.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/common/url_constants.h"
+#include "net/url_request/url_request.h"
#include "webkit/appcache/appcache_service.h"
#include "webkit/appcache/view_appcache_internals_job.h"
diff --git a/chrome/browser/browser_process.cc b/chrome/browser/browser_process.cc
index 5f52499..fa9c092 100644
--- a/chrome/browser/browser_process.cc
+++ b/chrome/browser/browser_process.cc
@@ -8,6 +8,10 @@
BrowserProcess* g_browser_process = NULL;
+BrowserProcess::BrowserProcess() {}
+
+BrowserProcess::~BrowserProcess() {}
+
DownloadRequestLimiter* BrowserProcess::download_request_limiter() {
ResourceDispatcherHost* rdh = resource_dispatcher_host();
return rdh ? rdh->download_request_limiter() : NULL;
diff --git a/chrome/browser/browser_process.h b/chrome/browser/browser_process.h
index 3293d98..5497932 100644
--- a/chrome/browser/browser_process.h
+++ b/chrome/browser/browser_process.h
@@ -49,8 +49,8 @@ class IOThread;
// These functions shouldn't return NULL unless otherwise noted.
class BrowserProcess {
public:
- BrowserProcess() {}
- virtual ~BrowserProcess() {}
+ BrowserProcess();
+ virtual ~BrowserProcess();
// Invoked when the user is logging out/shutting down. When logging off we may
// not have enough time to do a normal shutdown. This method is invoked prior
diff --git a/chrome/browser/debugger/devtools_netlog_observer.cc b/chrome/browser/debugger/devtools_netlog_observer.cc
index a9113b4..1aaf13e 100644
--- a/chrome/browser/debugger/devtools_netlog_observer.cc
+++ b/chrome/browser/debugger/devtools_netlog_observer.cc
@@ -9,6 +9,7 @@
#include "chrome/common/resource_response.h"
#include "net/base/load_flags.h"
#include "net/http/http_net_log_params.h"
+#include "net/url_request/url_request.h"
#include "net/url_request/url_request_netlog_params.h"
#include "webkit/glue/resource_loader_bridge.h"
diff --git a/chrome/browser/history/history_types.cc b/chrome/browser/history/history_types.cc
index 4591130..408bb93 100644
--- a/chrome/browser/history/history_types.cc
+++ b/chrome/browser/history/history_types.cc
@@ -311,19 +311,29 @@ void QueryOptions::SetRecentDayRange(int days_ago) {
// KeywordSearchTermVisit -----------------------------------------------------
-KeywordSearchTermVisit::KeywordSearchTermVisit() {
-}
+KeywordSearchTermVisit::KeywordSearchTermVisit() {}
+
+KeywordSearchTermVisit::~KeywordSearchTermVisit() {}
+
+// MostVisitedURL --------------------------------------------------------------
+
+MostVisitedURL::MostVisitedURL() {}
-KeywordSearchTermVisit::~KeywordSearchTermVisit() {
+MostVisitedURL::MostVisitedURL(const GURL& in_url,
+ const GURL& in_favicon_url,
+ const string16& in_title)
+ : url(in_url),
+ favicon_url(in_favicon_url),
+ title(in_title) {
}
+MostVisitedURL::~MostVisitedURL() {}
+
// Images ---------------------------------------------------------------------
-Images::Images() {
-}
+Images::Images() {}
-Images::~Images() {
-}
+Images::~Images() {}
// HistoryAddPageArgs ---------------------------------------------------------
@@ -348,8 +358,7 @@ HistoryAddPageArgs::HistoryAddPageArgs(
did_replace_entry(arg_did_replace_entry) {
}
-HistoryAddPageArgs::~HistoryAddPageArgs() {
-}
+HistoryAddPageArgs::~HistoryAddPageArgs() {}
HistoryAddPageArgs* HistoryAddPageArgs::Clone() const {
return new HistoryAddPageArgs(
diff --git a/chrome/browser/history/history_types.h b/chrome/browser/history/history_types.h
index b479cbc..831c0b0 100644
--- a/chrome/browser/history/history_types.h
+++ b/chrome/browser/history/history_types.h
@@ -527,6 +527,12 @@ struct KeywordSearchTermVisit {
// Holds the per-URL information of the most visited query.
struct MostVisitedURL {
+ MostVisitedURL();
+ MostVisitedURL(const GURL& in_url,
+ const GURL& in_favicon_url,
+ const string16& in_title);
+ ~MostVisitedURL();
+
GURL url;
GURL favicon_url;
string16 title;
diff --git a/chrome/browser/history/top_sites.cc b/chrome/browser/history/top_sites.cc
index 0e1ff1f..44e0887 100644
--- a/chrome/browser/history/top_sites.cc
+++ b/chrome/browser/history/top_sites.cc
@@ -279,11 +279,10 @@ bool TopSites::AddPrepopulatedPages(MostVisitedURLList* urls) {
bool added = false;
GURL welcome_url(l10n_util::GetStringUTF8(IDS_CHROME_WELCOME_URL));
if (urls->size() < kTopSitesNumber && IndexOf(*urls, welcome_url) == -1) {
- MostVisitedURL url = {
- welcome_url,
- GURL("chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON"),
- l10n_util::GetStringUTF16(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE)
- };
+ MostVisitedURL url(
+ welcome_url,
+ GURL("chrome://theme/IDR_NEWTAB_CHROME_WELCOME_PAGE_FAVICON"),
+ l10n_util::GetStringUTF16(IDS_NEW_TAB_CHROME_WELCOME_PAGE_TITLE));
url.redirects.push_back(welcome_url);
urls->push_back(url);
added = true;
@@ -291,11 +290,10 @@ bool TopSites::AddPrepopulatedPages(MostVisitedURLList* urls) {
GURL themes_url(l10n_util::GetStringUTF8(IDS_THEMES_GALLERY_URL));
if (urls->size() < kTopSitesNumber && IndexOf(*urls, themes_url) == -1) {
- MostVisitedURL url = {
- themes_url,
- GURL("chrome://theme/IDR_NEWTAB_THEMES_GALLERY_FAVICON"),
- l10n_util::GetStringUTF16(IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE)
- };
+ MostVisitedURL url(
+ themes_url,
+ GURL("chrome://theme/IDR_NEWTAB_THEMES_GALLERY_FAVICON"),
+ l10n_util::GetStringUTF16(IDS_NEW_TAB_THEMES_GALLERY_PAGE_TITLE));
url.redirects.push_back(themes_url);
urls->push_back(url);
added = true;
diff --git a/chrome/browser/history/top_sites_unittest.cc b/chrome/browser/history/top_sites_unittest.cc
index 77a3465..160b275 100644
--- a/chrome/browser/history/top_sites_unittest.cc
+++ b/chrome/browser/history/top_sites_unittest.cc
@@ -418,11 +418,11 @@ TEST_F(TopSitesTest, SetPageThumbnail) {
TEST_F(TopSitesTest, GetPageThumbnail) {
BrowserThread db_loop(BrowserThread::DB, MessageLoop::current());
MostVisitedURLList url_list;
- MostVisitedURL url1 = {GURL("http://asdf.com")};
+ MostVisitedURL url1(GURL("http://asdf.com"), GURL(), string16());
url1.redirects.push_back(url1.url);
url_list.push_back(url1);
- MostVisitedURL url2 = {GURL("http://gmail.com")};
+ MostVisitedURL url2(GURL("http://gmail.com"), GURL(), string16());
url2.redirects.push_back(url2.url);
url2.redirects.push_back(GURL("http://mail.google.com"));
url_list.push_back(url2);
@@ -1326,7 +1326,7 @@ TEST_F(TopSitesTest, AddPrepopulatedPages) {
pages.clear();
- MostVisitedURL url = {themes_url()};
+ MostVisitedURL url(themes_url(), GURL(), string16());
pages.push_back(url);
top_sites().AddPrepopulatedPages(&pages);
diff --git a/chrome/browser/io_thread.cc b/chrome/browser/io_thread.cc
index 0c9b114..8a18541 100644
--- a/chrome/browser/io_thread.cc
+++ b/chrome/browser/io_thread.cc
@@ -14,6 +14,7 @@
#include "chrome/browser/browser_thread.h"
#include "chrome/browser/gpu_process_host.h"
#include "chrome/browser/net/chrome_net_log.h"
+#include "chrome/browser/net/connect_interceptor.h"
#include "chrome/browser/net/predictor_api.h"
#include "chrome/browser/net/passive_log_collector.h"
#include "chrome/common/chrome_switches.h"
@@ -116,6 +117,10 @@ class LoggingNetworkChangeObserver
// Quit task.
DISABLE_RUNNABLE_METHOD_REFCOUNT(IOThread);
+IOThread::Globals::Globals() {}
+
+IOThread::Globals::~Globals() {}
+
IOThread::IOThread()
: BrowserProcessSubThread(BrowserThread::IO),
globals_(NULL),
diff --git a/chrome/browser/io_thread.h b/chrome/browser/io_thread.h
index 9485e0b..79891c9 100644
--- a/chrome/browser/io_thread.h
+++ b/chrome/browser/io_thread.h
@@ -12,19 +12,19 @@
#include "chrome/browser/browser_process_sub_thread.h"
#include "chrome/browser/net/chrome_network_delegate.h"
#include "chrome/common/net/predictor_common.h"
-#include "chrome/browser/net/connect_interceptor.h"
-#include "net/base/host_resolver.h"
#include "net/base/network_change_notifier.h"
class ChromeNetLog;
class ListValue;
namespace chrome_browser_net {
+class ConnectInterceptor;
class Predictor;
} // namespace chrome_browser_net
namespace net {
class DnsRRResolver;
+class HostResolver;
class HttpAuthHandlerFactory;
class URLSecurityManager;
} // namespace net
@@ -32,6 +32,9 @@ class URLSecurityManager;
class IOThread : public BrowserProcessSubThread {
public:
struct Globals {
+ Globals();
+ ~Globals();
+
scoped_ptr<ChromeNetLog> net_log;
scoped_ptr<net::HostResolver> host_resolver;
scoped_ptr<net::DnsRRResolver> dnsrr_resolver;
diff --git a/chrome/browser/net/view_blob_internals_job_factory.cc b/chrome/browser/net/view_blob_internals_job_factory.cc
index 25832a0..847d70d 100644
--- a/chrome/browser/net/view_blob_internals_job_factory.cc
+++ b/chrome/browser/net/view_blob_internals_job_factory.cc
@@ -7,6 +7,7 @@
#include "chrome/browser/net/chrome_url_request_context.h"
#include "chrome/browser/chrome_blob_storage_context.h"
#include "chrome/common/url_constants.h"
+#include "net/url_request/url_request.h"
#include "webkit/blob/view_blob_internals_job.h"
// static.
generated by cgit v1.1 at 2025-02-12 10:09:32 +0000