chrome/browser/ui/webui/extensions/extensions_ui.cc - Issue 453613002: Implement support for <extensionoptions> embedding in WebUI

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/ui/webui/extensions/extensions_ui.cc

Issue 453613002: Implement support for <extensionoptions> embedding in WebUI (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Fix object-src CSP override Created 6 years, 4 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/browser/guest_view/guest_view_base.cc ('k') | chrome/common/extensions/api/_api_features.json » ('j') | chrome/renderer/chrome_content_renderer_client.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/extensions/extensions_ui.h"	5 #include "chrome/browser/ui/webui/extensions/extensions_ui.h"

6	6

7 #include "chrome/browser/profiles/profile.h"	7 #include "chrome/browser/profiles/profile.h"

8 #include "chrome/browser/ui/webui/extensions/command_handler.h"	8 #include "chrome/browser/ui/webui/extensions/command_handler.h"

9 #include "chrome/browser/ui/webui/extensions/extension_error_handler.h"	9 #include "chrome/browser/ui/webui/extensions/extension_error_handler.h"

10 #include "chrome/browser/ui/webui/extensions/extension_loader_handler.h"	10 #include "chrome/browser/ui/webui/extensions/extension_loader_handler.h"

(...skipping 66 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
77	77

78 #if defined(OS_CHROMEOS)	78 #if defined(OS_CHROMEOS)

79 chromeos::KioskAppsHandler* kiosk_app_handler =	79 chromeos::KioskAppsHandler* kiosk_app_handler =

80 new chromeos::KioskAppsHandler();	80 new chromeos::KioskAppsHandler();

81 kiosk_app_handler->GetLocalizedValues(source);	81 kiosk_app_handler->GetLocalizedValues(source);

82 web_ui->AddMessageHandler(kiosk_app_handler);	82 web_ui->AddMessageHandler(kiosk_app_handler);

83 #endif	83 #endif

84	84

85 web_ui->AddMessageHandler(new MetricsHandler());	85 web_ui->AddMessageHandler(new MetricsHandler());

86	86

	87 source->OverrideContentSecurityPolicyObjectSrc(

	88 "object-src 'self';");
	not at google - send to devlin 2014/08/08 14:08:15 awesome! awesome!
	89

87 content::WebUIDataSource::Add(profile, source);	90 content::WebUIDataSource::Add(profile, source);

88 }	91 }

89	92

90 ExtensionsUI::~ExtensionsUI() {}	93 ExtensionsUI::~ExtensionsUI() {}

91	94

92 // static	95 // static

93 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes(	96 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes(

94 ui::ScaleFactor scale_factor) {	97 ui::ScaleFactor scale_factor) {

95 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();	98 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();

96 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor);	99 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor);

97 }	100 }

98	101

99 } // namespace extensions	102 } // namespace extensions

OLD	NEW