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

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: (again) 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
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/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 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
76 web_ui->AddMessageHandler(install_extension_handler); 76 web_ui->AddMessageHandler(install_extension_handler);
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
not at google - send to devlin 2014/08/12 00:08:23 mention why you need this
ericzeng 2014/08/12 00:32:26 Done.
87 source->OverrideContentSecurityPolicyObjectSrc("object-src 'self';");
88
87 content::WebUIDataSource::Add(profile, source); 89 content::WebUIDataSource::Add(profile, source);
88 } 90 }
89 91
90 ExtensionsUI::~ExtensionsUI() {} 92 ExtensionsUI::~ExtensionsUI() {}
91 93
92 // static 94 // static
93 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes( 95 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes(
94 ui::ScaleFactor scale_factor) { 96 ui::ScaleFactor scale_factor) {
95 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 97 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
96 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor); 98 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor);
97 } 99 }
98 100
99 } // namespace extensions 101 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698