Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(274)

Side by Side Diff: chrome/browser/privacy_blacklist/blocked_response.cc

Issue 193072: Move StringPiece into the base namespace. It is colliding (Closed)
Patch Set: take 2 Created 11 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/privacy_blacklist/blocked_response.h" 5 #include "chrome/browser/privacy_blacklist/blocked_response.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 22 matching lines...) Expand all
33 } 33 }
34 } 34 }
35 } else { 35 } else {
36 entry = match->entries().front(); 36 entry = match->entries().front();
37 } 37 }
38 DCHECK(entry); 38 DCHECK(entry);
39 39
40 strings.SetString(L"name", entry->provider()->name()); 40 strings.SetString(L"name", entry->provider()->name());
41 strings.SetString(L"url", entry->provider()->url()); 41 strings.SetString(L"url", entry->provider()->url());
42 42
43 const StringPiece html = 43 const base::StringPiece html =
44 ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_BLACKLIST_HTML); 44 ResourceBundle::GetSharedInstance().GetRawDataResource(IDR_BLACKLIST_HTML);
45 return jstemplate_builder::GetI18nTemplateHtml(html, &strings); 45 return jstemplate_builder::GetI18nTemplateHtml(html, &strings);
46 } 46 }
47 47
48 std::string GetImage(const Blacklist::Match*) { 48 std::string GetImage(const Blacklist::Match*) {
49 return ResourceBundle::GetSharedInstance(). 49 return ResourceBundle::GetSharedInstance().
50 GetDataResource(IDR_BLACKLIST_IMAGE); 50 GetDataResource(IDR_BLACKLIST_IMAGE);
51 } 51 }
52 52
53 } // namespace BlockedResponse 53 } // namespace BlockedResponse
OLDNEW
« no previous file with comments | « chrome/browser/extensions/user_script_master.cc ('k') | chrome/browser/ssl/ssl_blocking_page.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698