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

Side by Side Diff: chrome/browser/ui/webui/extensions/extensions_ui.cc

Issue 1019283004: Switch to direct use of OwnerSettingsServiceChromeOS::Set() in tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Nits. Created 5 years, 8 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_loader_handler.h" 9 #include "chrome/browser/ui/webui/extensions/extension_loader_handler.h"
10 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h" 10 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
11 #include "chrome/browser/ui/webui/extensions/install_extension_handler.h" 11 #include "chrome/browser/ui/webui/extensions/install_extension_handler.h"
12 #include "chrome/browser/ui/webui/metrics_handler.h" 12 #include "chrome/browser/ui/webui/metrics_handler.h"
13 #include "chrome/common/url_constants.h" 13 #include "chrome/common/url_constants.h"
14 #include "content/public/browser/web_ui.h" 14 #include "content/public/browser/web_ui.h"
15 #include "content/public/browser/web_ui_data_source.h" 15 #include "content/public/browser/web_ui_data_source.h"
16 #include "grit/browser_resources.h" 16 #include "grit/browser_resources.h"
17 #include "grit/theme_resources.h" 17 #include "grit/theme_resources.h"
18 #include "ui/base/resource/resource_bundle.h" 18 #include "ui/base/resource/resource_bundle.h"
19 19
20 #if defined(OS_CHROMEOS) 20 #if defined(OS_CHROMEOS)
21 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_fact ory.h"
21 #include "chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h" 22 #include "chrome/browser/ui/webui/extensions/chromeos/kiosk_apps_handler.h"
22 #endif 23 #endif
23 24
24 namespace extensions { 25 namespace extensions {
25 26
26 namespace { 27 namespace {
27 28
28 content::WebUIDataSource* CreateExtensionsHTMLSource() { 29 content::WebUIDataSource* CreateExtensionsHTMLSource() {
29 content::WebUIDataSource* source = 30 content::WebUIDataSource* source =
30 content::WebUIDataSource::Create(chrome::kChromeUIExtensionsFrameHost); 31 content::WebUIDataSource::Create(chrome::kChromeUIExtensionsFrameHost);
(...skipping 27 matching lines...) Expand all
58 extension_loader_handler->GetLocalizedValues(source); 59 extension_loader_handler->GetLocalizedValues(source);
59 web_ui->AddMessageHandler(extension_loader_handler); 60 web_ui->AddMessageHandler(extension_loader_handler);
60 61
61 InstallExtensionHandler* install_extension_handler = 62 InstallExtensionHandler* install_extension_handler =
62 new InstallExtensionHandler(); 63 new InstallExtensionHandler();
63 install_extension_handler->GetLocalizedValues(source); 64 install_extension_handler->GetLocalizedValues(source);
64 web_ui->AddMessageHandler(install_extension_handler); 65 web_ui->AddMessageHandler(install_extension_handler);
65 66
66 #if defined(OS_CHROMEOS) 67 #if defined(OS_CHROMEOS)
67 chromeos::KioskAppsHandler* kiosk_app_handler = 68 chromeos::KioskAppsHandler* kiosk_app_handler =
68 new chromeos::KioskAppsHandler(); 69 new chromeos::KioskAppsHandler(
70 chromeos::OwnerSettingsServiceChromeOSFactory::GetForBrowserContext(
71 profile));
69 kiosk_app_handler->GetLocalizedValues(source); 72 kiosk_app_handler->GetLocalizedValues(source);
70 web_ui->AddMessageHandler(kiosk_app_handler); 73 web_ui->AddMessageHandler(kiosk_app_handler);
71 #endif 74 #endif
72 75
73 web_ui->AddMessageHandler(new MetricsHandler()); 76 web_ui->AddMessageHandler(new MetricsHandler());
74 77
75 // Need to allow <object> elements so that the <extensionoptions> browser 78 // Need to allow <object> elements so that the <extensionoptions> browser
76 // plugin can be loaded within chrome://extensions. 79 // plugin can be loaded within chrome://extensions.
77 source->OverrideContentSecurityPolicyObjectSrc("object-src 'self';"); 80 source->OverrideContentSecurityPolicyObjectSrc("object-src 'self';");
78 81
79 content::WebUIDataSource::Add(profile, source); 82 content::WebUIDataSource::Add(profile, source);
80 } 83 }
81 84
82 ExtensionsUI::~ExtensionsUI() {} 85 ExtensionsUI::~ExtensionsUI() {}
83 86
84 // static 87 // static
85 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes( 88 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes(
86 ui::ScaleFactor scale_factor) { 89 ui::ScaleFactor scale_factor) {
87 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 90 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
88 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor); 91 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor);
89 } 92 }
90 93
91 } // namespace extensions 94 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698