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

Side by Side Diff: chrome/browser/search/local_ntp_source.cc

Issue 15906011: Use a direct include of strings headers in chrome/browser/r*-s*/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/search/iframe_source.cc ('k') | chrome/browser/search/search.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/search/local_ntp_source.h" 5 #include "chrome/browser/search/local_ntp_source.h"
6 6
7 #include "base/logging.h" 7 #include "base/logging.h"
8 #include "base/memory/ref_counted_memory.h" 8 #include "base/memory/ref_counted_memory.h"
9 #include "base/string_util.h" 9 #include "base/strings/string_util.h"
10 #include "base/stringprintf.h" 10 #include "base/strings/stringprintf.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/common/url_constants.h" 12 #include "chrome/common/url_constants.h"
13 #include "googleurl/src/gurl.h" 13 #include "googleurl/src/gurl.h"
14 #include "grit/browser_resources.h" 14 #include "grit/browser_resources.h"
15 #include "grit/generated_resources.h" 15 #include "grit/generated_resources.h"
16 #include "grit/ui_resources.h" 16 #include "grit/ui_resources.h"
17 #include "net/url_request/url_request.h" 17 #include "net/url_request/url_request.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
20 #include "ui/webui/jstemplate_builder.h" 20 #include "ui/webui/jstemplate_builder.h"
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
146 } 146 }
147 return false; 147 return false;
148 } 148 }
149 149
150 std::string LocalNtpSource::GetContentSecurityPolicyFrameSrc() const { 150 std::string LocalNtpSource::GetContentSecurityPolicyFrameSrc() const {
151 // Allow embedding of suggestion and most visited iframes. 151 // Allow embedding of suggestion and most visited iframes.
152 return base::StringPrintf("frame-src %s %s;", 152 return base::StringPrintf("frame-src %s %s;",
153 chrome::kChromeSearchSuggestionUrl, 153 chrome::kChromeSearchSuggestionUrl,
154 chrome::kChromeSearchMostVisitedUrl); 154 chrome::kChromeSearchMostVisitedUrl);
155 } 155 }
OLDNEW
« no previous file with comments | « chrome/browser/search/iframe_source.cc ('k') | chrome/browser/search/search.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698