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

Side by Side Diff: chrome/browser/ssl/ssl_blocking_page.cc

Issue 11929016: Move jstemplate_builder.* to ui\webui so it can be reused by webui implementations outside of chrom… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: sync to 177705 to get yfriendman's fix Created 7 years, 11 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
OLDNEW
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/ssl/ssl_blocking_page.h" 5 #include "chrome/browser/ssl/ssl_blocking_page.h"
6 6
7 #include "base/i18n/rtl.h" 7 #include "base/i18n/rtl.h"
8 #include "base/metrics/histogram.h" 8 #include "base/metrics/histogram.h"
9 #include "base/sha1.h" 9 #include "base/sha1.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/renderer_preferences_util.h" 15 #include "chrome/browser/renderer_preferences_util.h"
16 #include "chrome/browser/ssl/ssl_error_info.h" 16 #include "chrome/browser/ssl/ssl_error_info.h"
17 #include "chrome/common/jstemplate_builder.h"
18 #include "content/public/browser/cert_store.h" 17 #include "content/public/browser/cert_store.h"
19 #include "content/public/browser/interstitial_page.h" 18 #include "content/public/browser/interstitial_page.h"
20 #include "content/public/browser/navigation_controller.h" 19 #include "content/public/browser/navigation_controller.h"
21 #include "content/public/browser/navigation_entry.h" 20 #include "content/public/browser/navigation_entry.h"
22 #include "content/public/browser/notification_service.h" 21 #include "content/public/browser/notification_service.h"
23 #include "content/public/browser/notification_types.h" 22 #include "content/public/browser/notification_types.h"
24 #include "content/public/browser/render_process_host.h" 23 #include "content/public/browser/render_process_host.h"
25 #include "content/public/browser/render_view_host.h" 24 #include "content/public/browser/render_view_host.h"
26 #include "content/public/browser/web_contents.h" 25 #include "content/public/browser/web_contents.h"
27 #include "content/public/common/ssl_status.h" 26 #include "content/public/common/ssl_status.h"
28 #include "grit/browser_resources.h" 27 #include "grit/browser_resources.h"
29 #include "grit/generated_resources.h" 28 #include "grit/generated_resources.h"
30 #include "net/base/net_errors.h" 29 #include "net/base/net_errors.h"
31 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
32 #include "ui/base/resource/resource_bundle.h" 31 #include "ui/base/resource/resource_bundle.h"
32 #include "ui/webui/jstemplate_builder.h"
33 33
34 using base::TimeDelta; 34 using base::TimeDelta;
35 using base::TimeTicks; 35 using base::TimeTicks;
36 using content::InterstitialPage; 36 using content::InterstitialPage;
37 using content::NavigationController; 37 using content::NavigationController;
38 using content::NavigationEntry; 38 using content::NavigationEntry;
39 39
40 #define HISTOGRAM_INTERSTITIAL_SMALL_TIME(name, sample) \ 40 #define HISTOGRAM_INTERSTITIAL_SMALL_TIME(name, sample) \
41 UMA_HISTOGRAM_CUSTOM_TIMES( \ 41 UMA_HISTOGRAM_CUSTOM_TIMES( \
42 name, \ 42 name, \
(...skipping 355 matching lines...) Expand 10 before | Expand all | Expand 10 after
398 "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5" 398 "moreInfo1", "moreInfo2", "moreInfo3", "moreInfo4", "moreInfo5"
399 }; 399 };
400 int i; 400 int i;
401 for (i = 0; i < static_cast<int>(extra_info.size()); i++) { 401 for (i = 0; i < static_cast<int>(extra_info.size()); i++) {
402 strings->SetString(keys[i], extra_info[i]); 402 strings->SetString(keys[i], extra_info[i]);
403 } 403 }
404 for (; i < 5; i++) { 404 for (; i < 5; i++) {
405 strings->SetString(keys[i], ""); 405 strings->SetString(keys[i], "");
406 } 406 }
407 } 407 }
OLDNEW
« no previous file with comments | « chrome/browser/safe_browsing/safe_browsing_blocking_page.cc ('k') | chrome/browser/ui/pdf/pdf_unsupported_feature.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698