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

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

Issue 252593003: Improve UI for unpacked extensions failing to load (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Android fix Created 6 years, 7 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 | Annotate | Revision Log
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_settings_handler.h" 11 #include "chrome/browser/ui/webui/extensions/extension_settings_handler.h"
11 #include "chrome/browser/ui/webui/extensions/install_extension_handler.h" 12 #include "chrome/browser/ui/webui/extensions/install_extension_handler.h"
12 #include "chrome/browser/ui/webui/extensions/pack_extension_handler.h" 13 #include "chrome/browser/ui/webui/extensions/pack_extension_handler.h"
13 #include "chrome/browser/ui/webui/metrics_handler.h" 14 #include "chrome/browser/ui/webui/metrics_handler.h"
14 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
15 #include "content/public/browser/web_ui.h" 16 #include "content/public/browser/web_ui.h"
16 #include "content/public/browser/web_ui_data_source.h" 17 #include "content/public/browser/web_ui_data_source.h"
17 #include "grit/browser_resources.h" 18 #include "grit/browser_resources.h"
18 #include "grit/theme_resources.h" 19 #include "grit/theme_resources.h"
19 #include "ui/base/resource/resource_bundle.h" 20 #include "ui/base/resource/resource_bundle.h"
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
57 58
58 CommandHandler* commands_handler = new CommandHandler(profile); 59 CommandHandler* commands_handler = new CommandHandler(profile);
59 commands_handler->GetLocalizedValues(source); 60 commands_handler->GetLocalizedValues(source);
60 web_ui->AddMessageHandler(commands_handler); 61 web_ui->AddMessageHandler(commands_handler);
61 62
62 ExtensionErrorHandler* extension_error_handler = 63 ExtensionErrorHandler* extension_error_handler =
63 new ExtensionErrorHandler(profile); 64 new ExtensionErrorHandler(profile);
64 extension_error_handler->GetLocalizedValues(source); 65 extension_error_handler->GetLocalizedValues(source);
65 web_ui->AddMessageHandler(extension_error_handler); 66 web_ui->AddMessageHandler(extension_error_handler);
66 67
68 ExtensionLoaderHandler* extension_loader_handler =
69 new ExtensionLoaderHandler(profile);
70 extension_loader_handler->GetLocalizedValues(source);
71 web_ui->AddMessageHandler(extension_loader_handler);
72
67 InstallExtensionHandler* install_extension_handler = 73 InstallExtensionHandler* install_extension_handler =
68 new InstallExtensionHandler(); 74 new InstallExtensionHandler();
69 install_extension_handler->GetLocalizedValues(source); 75 install_extension_handler->GetLocalizedValues(source);
70 web_ui->AddMessageHandler(install_extension_handler); 76 web_ui->AddMessageHandler(install_extension_handler);
71 77
72 #if defined(OS_CHROMEOS) 78 #if defined(OS_CHROMEOS)
73 chromeos::KioskAppsHandler* kiosk_app_handler = 79 chromeos::KioskAppsHandler* kiosk_app_handler =
74 new chromeos::KioskAppsHandler(); 80 new chromeos::KioskAppsHandler();
75 kiosk_app_handler->GetLocalizedValues(source); 81 kiosk_app_handler->GetLocalizedValues(source);
76 web_ui->AddMessageHandler(kiosk_app_handler); 82 web_ui->AddMessageHandler(kiosk_app_handler);
77 #endif 83 #endif
78 84
79 web_ui->AddMessageHandler(new MetricsHandler()); 85 web_ui->AddMessageHandler(new MetricsHandler());
80 86
81 content::WebUIDataSource::Add(profile, source); 87 content::WebUIDataSource::Add(profile, source);
82 } 88 }
83 89
84 ExtensionsUI::~ExtensionsUI() {} 90 ExtensionsUI::~ExtensionsUI() {}
85 91
86 // static 92 // static
87 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes( 93 base::RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes(
88 ui::ScaleFactor scale_factor) { 94 ui::ScaleFactor scale_factor) {
89 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance(); 95 ui::ResourceBundle& rb = ui::ResourceBundle::GetSharedInstance();
90 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor); 96 return rb.LoadDataResourceBytesForScale(IDR_EXTENSIONS_FAVICON, scale_factor);
91 } 97 }
92 98
93 } // namespace extensions 99 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/ui/webui/extensions/extension_settings_handler.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698