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

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

Issue 22938005: Add ErrorConsole UI for Extension Install Warnings (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@dc_ec_install_warnings
Patch Set: License Created 7 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
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_settings_handler.h" 10 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
10 #include "chrome/browser/ui/webui/extensions/install_extension_handler.h" 11 #include "chrome/browser/ui/webui/extensions/install_extension_handler.h"
11 #include "chrome/browser/ui/webui/extensions/pack_extension_handler.h" 12 #include "chrome/browser/ui/webui/extensions/pack_extension_handler.h"
12 #include "chrome/browser/ui/webui/metrics_handler.h" 13 #include "chrome/browser/ui/webui/metrics_handler.h"
13 #include "chrome/common/url_constants.h" 14 #include "chrome/common/url_constants.h"
14 #include "content/public/browser/web_ui.h" 15 #include "content/public/browser/web_ui.h"
15 #include "content/public/browser/web_ui_data_source.h" 16 #include "content/public/browser/web_ui_data_source.h"
16 #include "grit/browser_resources.h" 17 #include "grit/browser_resources.h"
17 #include "grit/theme_resources.h" 18 #include "grit/theme_resources.h"
18 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 web_ui->AddMessageHandler(handler); 52 web_ui->AddMessageHandler(handler);
52 53
53 PackExtensionHandler* pack_handler = new PackExtensionHandler(); 54 PackExtensionHandler* pack_handler = new PackExtensionHandler();
54 pack_handler->GetLocalizedValues(source); 55 pack_handler->GetLocalizedValues(source);
55 web_ui->AddMessageHandler(pack_handler); 56 web_ui->AddMessageHandler(pack_handler);
56 57
57 CommandHandler* commands_handler = new CommandHandler(profile); 58 CommandHandler* commands_handler = new CommandHandler(profile);
58 commands_handler->GetLocalizedValues(source); 59 commands_handler->GetLocalizedValues(source);
59 web_ui->AddMessageHandler(commands_handler); 60 web_ui->AddMessageHandler(commands_handler);
60 61
62 ExtensionErrorHandler* extension_error_handler =
63 new ExtensionErrorHandler(profile);
64 extension_error_handler->GetLocalizedValues(source);
65 web_ui->AddMessageHandler(extension_error_handler);
66
61 InstallExtensionHandler* install_extension_handler = 67 InstallExtensionHandler* install_extension_handler =
62 new InstallExtensionHandler(); 68 new InstallExtensionHandler();
63 install_extension_handler->GetLocalizedValues(source); 69 install_extension_handler->GetLocalizedValues(source);
64 web_ui->AddMessageHandler(install_extension_handler); 70 web_ui->AddMessageHandler(install_extension_handler);
65 71
66 #if defined(OS_CHROMEOS) 72 #if defined(OS_CHROMEOS)
67 chromeos::KioskAppsHandler* kiosk_app_handler = 73 chromeos::KioskAppsHandler* kiosk_app_handler =
68 new chromeos::KioskAppsHandler(); 74 new chromeos::KioskAppsHandler();
69 kiosk_app_handler->GetLocalizedValues(source); 75 kiosk_app_handler->GetLocalizedValues(source);
70 web_ui->AddMessageHandler(kiosk_app_handler); 76 web_ui->AddMessageHandler(kiosk_app_handler);
71 #endif 77 #endif
72 78
73 web_ui->AddMessageHandler(new MetricsHandler()); 79 web_ui->AddMessageHandler(new MetricsHandler());
74 80
75 content::WebUIDataSource::Add(profile, source); 81 content::WebUIDataSource::Add(profile, source);
76 } 82 }
77 83
78 ExtensionsUI::~ExtensionsUI() {} 84 ExtensionsUI::~ExtensionsUI() {}
79 85
80 // static 86 // static
81 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes( 87 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes(
82 ui::ScaleFactor scale_factor) { 88 ui::ScaleFactor scale_factor) {
83 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 89 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
84 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor); 90 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor);
85 } 91 }
86 92
87 } // namespace extensions 93 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.cc ('k') | chrome/chrome_browser_extensions.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698