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

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: Simplify a bit. 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"
(...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 extension_loader_handler->GetLocalizedValues(source); 58 extension_loader_handler->GetLocalizedValues(source);
59 web_ui->AddMessageHandler(extension_loader_handler); 59 web_ui->AddMessageHandler(extension_loader_handler);
60 60
61 InstallExtensionHandler* install_extension_handler = 61 InstallExtensionHandler* install_extension_handler =
62 new InstallExtensionHandler(); 62 new InstallExtensionHandler();
63 install_extension_handler->GetLocalizedValues(source); 63 install_extension_handler->GetLocalizedValues(source);
64 web_ui->AddMessageHandler(install_extension_handler); 64 web_ui->AddMessageHandler(install_extension_handler);
65 65
66 #if defined(OS_CHROMEOS) 66 #if defined(OS_CHROMEOS)
67 chromeos::KioskAppsHandler* kiosk_app_handler = 67 chromeos::KioskAppsHandler* kiosk_app_handler =
68 new chromeos::KioskAppsHandler(); 68 new chromeos::KioskAppsHandler(profile);
69 kiosk_app_handler->GetLocalizedValues(source); 69 kiosk_app_handler->GetLocalizedValues(source);
70 web_ui->AddMessageHandler(kiosk_app_handler); 70 web_ui->AddMessageHandler(kiosk_app_handler);
71 #endif 71 #endif
72 72
73 web_ui->AddMessageHandler(new MetricsHandler()); 73 web_ui->AddMessageHandler(new MetricsHandler());
74 74
75 // Need to allow <object> elements so that the <extensionoptions> browser 75 // Need to allow <object> elements so that the <extensionoptions> browser
76 // plugin can be loaded within chrome://extensions. 76 // plugin can be loaded within chrome://extensions.
77 source->OverrideContentSecurityPolicyObjectSrc("object-src 'self';"); 77 source->OverrideContentSecurityPolicyObjectSrc("object-src 'self';");
78 78
79 content::WebUIDataSource::Add(profile, source); 79 content::WebUIDataSource::Add(profile, source);
80 } 80 }
81 81
82 ExtensionsUI::~ExtensionsUI() {} 82 ExtensionsUI::~ExtensionsUI() {}
83 83
84 // static 84 // static
85 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes( 85 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes(
86 ui::ScaleFactor scale_factor) { 86 ui::ScaleFactor scale_factor) {
87 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 87 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
88 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor); 88 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor);
89 } 89 }
90 90
91 } // namespace extensions 91 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698