chrome/browser/ssl/ssl_policy.cc - Issue 109043: Move l10n_util to app/

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

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

Issue 109043: Move l10n_util to app/ (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 7 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/ssl/ssl_manager.cc ('k') | chrome/browser/tab_contents/infobar_delegate.cc » ('j') | no next file with comments »

OLD	NEW
1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2006-2008 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_policy.h"	5 #include "chrome/browser/ssl/ssl_policy.h"

6	6

	7 #include "app/l10n_util.h"

7 #include "app/resource_bundle.h"	8 #include "app/resource_bundle.h"

8 #include "base/singleton.h"	9 #include "base/singleton.h"

9 #include "base/string_piece.h"	10 #include "base/string_piece.h"

10 #include "base/string_util.h"	11 #include "base/string_util.h"

11 #include "chrome/browser/cert_store.h"	12 #include "chrome/browser/cert_store.h"

12 #include "chrome/browser/renderer_host/render_view_host.h"	13 #include "chrome/browser/renderer_host/render_view_host.h"

13 #include "chrome/browser/ssl/ssl_error_info.h"	14 #include "chrome/browser/ssl/ssl_error_info.h"

14 #include "chrome/browser/tab_contents/navigation_entry.h"	15 #include "chrome/browser/tab_contents/navigation_entry.h"

15 #include "chrome/browser/tab_contents/tab_contents.h"	16 #include "chrome/browser/tab_contents/tab_contents.h"

16 #include "chrome/common/jstemplate_builder.h"	17 #include "chrome/common/jstemplate_builder.h"

17 #include "chrome/common/l10n_util.h"

18 #include "chrome/common/notification_service.h"	18 #include "chrome/common/notification_service.h"

19 #include "chrome/common/pref_names.h"	19 #include "chrome/common/pref_names.h"

20 #include "chrome/common/pref_service.h"	20 #include "chrome/common/pref_service.h"

21 #include "chrome/common/chrome_switches.h"	21 #include "chrome/common/chrome_switches.h"

22 #include "chrome/common/time_format.h"	22 #include "chrome/common/time_format.h"

23 #include "chrome/common/url_constants.h"	23 #include "chrome/common/url_constants.h"

24 #include "grit/browser_resources.h"	24 #include "grit/browser_resources.h"

25 #include "grit/generated_resources.h"	25 #include "grit/generated_resources.h"

26 #include "net/base/cert_status_flags.h"	26 #include "net/base/cert_status_flags.h"

27 #include "net/base/ssl_info.h"	27 #include "net/base/ssl_info.h"

(...skipping 329 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
357	357

358 void SSLPolicy::OnFatalCertError(SSLManager::CertError* error) {	358 void SSLPolicy::OnFatalCertError(SSLManager::CertError* error) {

359 if (error->resource_type() != ResourceType::MAIN_FRAME) {	359 if (error->resource_type() != ResourceType::MAIN_FRAME) {

360 error->DenyRequest();	360 error->DenyRequest();

361 return;	361 return;

362 }	362 }

363 error->CancelRequest();	363 error->CancelRequest();

364 ShowErrorPage(this, error);	364 ShowErrorPage(this, error);

365 // No need to degrade our security indicators because we didn't continue.	365 // No need to degrade our security indicators because we didn't continue.

366 }	366 }

OLD	NEW