chrome/renderer/content_settings_observer.cc - Issue 2387613002: Merge Content Settings IPCs back to chrome/common/render_messages.h

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/renderer/content_settings_observer.cc

Issue 2387613002: Merge Content Settings IPCs back to chrome/common/render_messages.h (Closed)

Patch Set: Cover param_traits in chrome/common/OWNERS, as requested by the presubmit script Created 4 years, 2 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

« no previous file with comments | « chrome/renderer/DEPS ('k') | chrome/renderer/content_settings_observer_browsertest.cc » ('j') | no next file with comments »

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/renderer/content_settings_observer.h"	5 #include "chrome/renderer/content_settings_observer.h"

6	6

	7 #include "chrome/common/render_messages.h"

7 #include "chrome/common/ssl_insecure_content.h"	8 #include "chrome/common/ssl_insecure_content.h"

8 #include "components/content_settings/content/common/content_settings_messages.h "

9 #include "content/public/common/url_constants.h"	9 #include "content/public/common/url_constants.h"

10 #include "content/public/renderer/document_state.h"	10 #include "content/public/renderer/document_state.h"

11 #include "content/public/renderer/render_frame.h"	11 #include "content/public/renderer/render_frame.h"

12 #include "content/public/renderer/render_view.h"	12 #include "content/public/renderer/render_view.h"

13 #include "third_party/WebKit/public/platform/URLConversion.h"	13 #include "third_party/WebKit/public/platform/URLConversion.h"

14 #include "third_party/WebKit/public/platform/WebContentSettingCallbacks.h"	14 #include "third_party/WebKit/public/platform/WebContentSettingCallbacks.h"

15 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"	15 #include "third_party/WebKit/public/platform/WebSecurityOrigin.h"

16 #include "third_party/WebKit/public/platform/WebURL.h"	16 #include "third_party/WebKit/public/platform/WebURL.h"

17 #include "third_party/WebKit/public/web/WebDataSource.h"	17 #include "third_party/WebKit/public/web/WebDataSource.h"

18 #include "third_party/WebKit/public/web/WebDocument.h"	18 #include "third_party/WebKit/public/web/WebDocument.h"

(...skipping 522 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
541	541

542 // If the scheme is file:, an empty file name indicates a directory listing,	542 // If the scheme is file:, an empty file name indicates a directory listing,

543 // which requires JavaScript to function properly.	543 // which requires JavaScript to function properly.

544 if (base::EqualsASCII(protocol, url::kFileScheme)) {	544 if (base::EqualsASCII(protocol, url::kFileScheme)) {

545 return document_url.SchemeIs(url::kFileScheme) &&	545 return document_url.SchemeIs(url::kFileScheme) &&

546 document_url.ExtractFileName().empty();	546 document_url.ExtractFileName().empty();

547 }	547 }

548	548

549 return false;	549 return false;

550 }	550 }

OLD	NEW