chrome/renderer/extensions/renderer_permissions_policy_delegate.cc - Issue 559103003: Cleanup: Remove Dispatcher and UserScript classes from builds where extensions are disabled.

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/extensions/renderer_permissions_policy_delegate.cc

Issue 559103003: Cleanup: Remove Dispatcher and UserScript classes from builds where extensions are disabled. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 3 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

OLD	NEW
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/renderer/extensions/renderer_permissions_policy_delegate.h"	5 #include "chrome/renderer/extensions/renderer_permissions_policy_delegate.h"

6	6

7 #include "base/command_line.h"	7 #include "base/command_line.h"

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

9 #include "chrome/common/extensions/extension_constants.h"	9 #include "chrome/common/extensions/extension_constants.h"

10 #include "extensions/common/constants.h"	10 #include "extensions/common/constants.h"

(...skipping 28 matching lines...) Expand all Loading...
39 return true;	39 return true;

40 }	40 }

41	41

42 CommandLine* command_line = CommandLine::ForCurrentProcess();	42 CommandLine* command_line = CommandLine::ForCurrentProcess();

43 if (command_line->HasSwitch(::switches::kSigninProcess)) {	43 if (command_line->HasSwitch(::switches::kSigninProcess)) {

44 if (error)	44 if (error)

45 *error = errors::kCannotScriptSigninPage;	45 *error = errors::kCannotScriptSigninPage;

46 return false;	46 return false;

47 }	47 }

48	48

	49 // TODO(thestig): Remove scaffolding once this file no longer builds with

	50 // extensions disabled.

	51 #if defined(ENABLE_EXTENSIONS)

49 if (dispatcher_->IsExtensionActive(extensions::kWebStoreAppId)) {	52 if (dispatcher_->IsExtensionActive(extensions::kWebStoreAppId)) {

50 if (error)	53 if (error)

51 *error = errors::kCannotScriptGallery;	54 *error = errors::kCannotScriptGallery;

52 return false;	55 return false;

53 }	56 }

	57 #endif

54	58

55 return true;	59 return true;

56 }	60 }

57	61

58 } // namespace extensions	62 } // namespace extensions

OLD	NEW

« no previous file with comments | « chrome/renderer/extensions/extension_frame_helper.cc ('k') | chrome/renderer/pepper/pepper_uma_host.cc » ('j') | no next file with comments »