diff options
| author | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-19 15:58:55 +0000 |
|---|---|---|
| committer | deanm@google.com <deanm@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2008-09-19 15:58:55 +0000 |
| commit | 23afa0fbdf77203d6ff57394ed0e2c1c3195b2bd (patch) | |
| tree | 06e451dc4618209dff5ac0cc14d7cd4be0e58374 /chrome/browser/google_url_tracker.cc | |
| parent | c45b0b4811d594009e988ecf9eb5b6da55e7f5df (diff) | |
| download | chromium_src-23afa0fbdf77203d6ff57394ed0e2c1c3195b2bd.zip chromium_src-23afa0fbdf77203d6ff57394ed0e2c1c3195b2bd.tar.gz chromium_src-23afa0fbdf77203d6ff57394ed0e2c1c3195b2bd.tar.bz2 | |
Build a bunch more of chrome/ on Linux.
Patch from Pawel Hajdan Jr.
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@2408 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/google_url_tracker.cc')
| -rw-r--r-- | chrome/browser/google_url_tracker.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chrome/browser/google_url_tracker.cc b/chrome/browser/google_url_tracker.cc index 6bab5ec..6dfdbd6 100644 --- a/chrome/browser/google_url_tracker.cc +++ b/chrome/browser/google_url_tracker.cc @@ -4,6 +4,7 @@ #include "chrome/browser/google_url_tracker.h" +#include "base/compiler_specific.h" #include "base/string_util.h" #include "chrome/browser/browser_process.h" #include "chrome/browser/profile.h" @@ -15,10 +16,9 @@ const char GoogleURLTracker::kDefaultGoogleHomepage[] = "http://www.google.com/"; GoogleURLTracker::GoogleURLTracker() - : google_url_(g_browser_process->local_state()->GetString( - prefs::kLastKnownGoogleURL)), -#pragma warning(suppress: 4355) // Okay to pass "this" here. - fetcher_factory_(this), + : google_url_(WideToUTF8(g_browser_process->local_state()->GetString( + prefs::kLastKnownGoogleURL))), + ALLOW_THIS_IN_INITIALIZER_LIST(fetcher_factory_(this)), in_startup_sleep_(true), already_fetched_(false), need_to_fetch_(false), |