diff options
| author | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 00:06:22 +0000 |
|---|---|---|
| committer | jhawkins@chromium.org <jhawkins@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-02-19 00:06:22 +0000 |
| commit | 5b7c7d3cee3cff13b9fe681b182391e1734833ff (patch) | |
| tree | 9737f5bd93a9ac8621b5d425cea8c81ed39eb819 /chrome/browser | |
| parent | 6abef1768b1f65779bf520e39e6825752971d709 (diff) | |
| download | chromium_src-5b7c7d3cee3cff13b9fe681b182391e1734833ff.zip chromium_src-5b7c7d3cee3cff13b9fe681b182391e1734833ff.tar.gz chromium_src-5b7c7d3cee3cff13b9fe681b182391e1734833ff.tar.bz2 | |
Make safe_browsing_blocking_page.cc compile on Posix.
Review URL: http://codereview.chromium.org/21480
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@9994 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser')
4 files changed, 5 insertions, 9 deletions
diff --git a/chrome/browser/browser.scons b/chrome/browser/browser.scons index e6fab55..ac66265 100644 --- a/chrome/browser/browser.scons +++ b/chrome/browser/browser.scons @@ -738,7 +738,6 @@ if not env.Bit('windows'): 'printing/printer_query.cc', 'printing/win_printing_context.cc', 'rlz/rlz.cc', - 'safe_browsing/safe_browsing_blocking_page.cc', 'sandbox_policy.cc', 'search_engines/template_url_fetcher.cc', 'shell_integration.cc', diff --git a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc index 7cf8171..9d912bf 100644 --- a/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc +++ b/chrome/browser/safe_browsing/safe_browsing_blocking_page.cc @@ -55,8 +55,8 @@ SafeBrowsingBlockingPage::SafeBrowsingBlockingPage( IsMainPage(unsafe_resources), unsafe_resources[0].url), sb_service_(sb_service), - unsafe_resources_(unsafe_resources), - is_main_frame_(IsMainPage(unsafe_resources)) { + is_main_frame_(IsMainPage(unsafe_resources)), + unsafe_resources_(unsafe_resources) { if (!is_main_frame_) { navigation_entry_index_to_remove_ = tab()->controller()->GetLastCommittedEntryIndex(); @@ -265,10 +265,10 @@ void SafeBrowsingBlockingPage::CommandReceived(const std::string& cmd) { // User pressed "Learn more". GURL url; if (unsafe_resources_[0].threat_type == SafeBrowsingService::URL_MALWARE) { - url = GURL(l10n_util::GetString(IDS_LEARN_MORE_MALWARE_URL)); + url = GURL(WideToUTF8(l10n_util::GetString(IDS_LEARN_MORE_MALWARE_URL))); } else if (unsafe_resources_[0].threat_type == SafeBrowsingService::URL_PHISHING) { - url = GURL(l10n_util::GetString(IDS_LEARN_MORE_PHISHING_URL)); + url = GURL(WideToUTF8(l10n_util::GetString(IDS_LEARN_MORE_PHISHING_URL))); } else { NOTREACHED(); } diff --git a/chrome/browser/safe_browsing/safe_browsing_service.cc b/chrome/browser/safe_browsing/safe_browsing_service.cc index d5c1884..bb281b3 100644 --- a/chrome/browser/safe_browsing/safe_browsing_service.cc +++ b/chrome/browser/safe_browsing/safe_browsing_service.cc @@ -14,6 +14,7 @@ #include "chrome/browser/browser_process.h" #include "chrome/browser/chrome_thread.h" #include "chrome/browser/profile_manager.h" +#include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" #include "chrome/browser/safe_browsing/safe_browsing_database.h" #include "chrome/browser/tab_contents/tab_util.h" #include "chrome/common/chrome_constants.h" @@ -26,7 +27,6 @@ #if defined(OS_WIN) // TODO(port): Place this header above once we've ported protocol_manager.* #include "chrome/browser/safe_browsing/protocol_manager.h" -#include "chrome/browser/safe_browsing/safe_browsing_blocking_page.h" #elif defined(OS_POSIX) #include "chrome/common/temp_scaffolding_stubs.h" #endif diff --git a/chrome/browser/safe_browsing/safe_browsing_util.cc b/chrome/browser/safe_browsing/safe_browsing_util.cc index fcc185b..67edb12 100644 --- a/chrome/browser/safe_browsing/safe_browsing_util.cc +++ b/chrome/browser/safe_browsing/safe_browsing_util.cc @@ -191,8 +191,6 @@ void FreeChunks(std::deque<SBChunk>* chunks) { } } -#if defined(OS_WIN) -// TODO(port): remove conditional #ifs when google_util is ported GURL GeneratePhishingReportUrl(const std::string& report_page, const std::string& url_to_report) { Locale locale = Locale::getDefault(); @@ -208,7 +206,6 @@ GURL GeneratePhishingReportUrl(const std::string& report_page, current_esc.c_str())); return google_util::AppendGoogleLocaleParam(report_url); } -#endif } // namespace safe_browsing_util |