OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/ui/webui/ntp/ntp_resource_cache.h" | 5 #include "chrome/browser/ui/webui/ntp/ntp_resource_cache.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/memory/ref_counted_memory.h" | 8 #include "base/memory/ref_counted_memory.h" |
9 #include "base/string16.h" | 9 #include "base/string16.h" |
10 #include "base/string_piece.h" | 10 #include "base/string_piece.h" |
11 #include "base/utf_string_conversions.h" | 11 #include "base/utf_string_conversions.h" |
12 #include "base/values.h" | 12 #include "base/values.h" |
13 #include "chrome/browser/google/google_util.h" | 13 #include "chrome/browser/google/google_util.h" |
14 #include "chrome/browser/profiles/profile.h" | 14 #include "chrome/browser/profiles/profile.h" |
15 #include "chrome/browser/ui/webui/web_ui_util.h" | 15 #include "chrome/browser/ui/webui/web_ui_util.h" |
16 #include "chrome/common/chrome_switches.h" | 16 #include "chrome/common/chrome_switches.h" |
17 #include "chrome/common/jstemplate_builder.h" | |
18 #include "content/public/browser/browser_thread.h" | 17 #include "content/public/browser/browser_thread.h" |
19 #include "content/public/browser/notification_service.h" | 18 #include "content/public/browser/notification_service.h" |
20 #include "grit/browser_resources.h" | 19 #include "grit/browser_resources.h" |
21 #include "grit/generated_resources.h" | 20 #include "grit/generated_resources.h" |
22 #include "ui/base/l10n/l10n_util.h" | 21 #include "ui/base/l10n/l10n_util.h" |
23 #include "ui/base/resource/resource_bundle.h" | 22 #include "ui/base/resource/resource_bundle.h" |
| 23 #include "ui/webui/jstemplate_builder.h" |
24 | 24 |
25 using content::BrowserThread; | 25 using content::BrowserThread; |
26 | 26 |
27 namespace { | 27 namespace { |
28 | 28 |
29 const char kLearnMoreIncognitoUrl[] = | 29 const char kLearnMoreIncognitoUrl[] = |
30 "https://www.google.com/support/chrome/bin/answer.py?answer=95464"; | 30 "https://www.google.com/support/chrome/bin/answer.py?answer=95464"; |
31 | 31 |
32 } // namespace | 32 } // namespace |
33 | 33 |
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
135 size_t after_offset = pos + template_data_placeholder.size(); | 135 size_t after_offset = pos + template_data_placeholder.size(); |
136 full_html.append(new_tab_html.data() + after_offset, | 136 full_html.append(new_tab_html.data() + after_offset, |
137 new_tab_html.size() - after_offset); | 137 new_tab_html.size() - after_offset); |
138 } else { | 138 } else { |
139 NOTREACHED(); | 139 NOTREACHED(); |
140 full_html.assign(new_tab_html.data(), new_tab_html.size()); | 140 full_html.assign(new_tab_html.data(), new_tab_html.size()); |
141 } | 141 } |
142 | 142 |
143 new_tab_html_ = base::RefCountedString::TakeString(&full_html); | 143 new_tab_html_ = base::RefCountedString::TakeString(&full_html); |
144 } | 144 } |
OLD | NEW |