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

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

Issue 165216: Revert 22874 - Merge 21719 Make possible reloading extensions from the chrom... (Closed) Base URL: svn://chrome-svn/chrome/branches/195/src/
Patch Set: Created 11 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/extensions/extensions_ui.h ('k') | chrome/browser/resources/extensions_ui.html » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Property Changes:
Modified: svn:mergeinfo
Reverse-merged /branches/chrome_webkit_merge_branch/chrome/browser/extensions/extensions_ui.cc:r69-2775
Reverse-merged /trunk/src/chrome/browser/extensions/extensions_ui.cc:r21719
OLDNEW
1 // Copyright (c) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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/extensions/extensions_ui.h" 5 #include "chrome/browser/extensions/extensions_ui.h"
6 6
7 #include "app/l10n_util.h" 7 #include "app/l10n_util.h"
8 #include "app/resource_bundle.h" 8 #include "app/resource_bundle.h"
9 #include "base/string_util.h" 9 #include "base/string_util.h"
10 #include "base/thread.h" 10 #include "base/thread.h"
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 ExtensionsDOMHandler::ExtensionsDOMHandler( 68 ExtensionsDOMHandler::ExtensionsDOMHandler(
69 ExtensionsService* extension_service) 69 ExtensionsService* extension_service)
70 : extensions_service_(extension_service) { 70 : extensions_service_(extension_service) {
71 } 71 }
72 72
73 void ExtensionsDOMHandler::RegisterMessages() { 73 void ExtensionsDOMHandler::RegisterMessages() {
74 dom_ui_->RegisterMessageCallback("requestExtensionsData", 74 dom_ui_->RegisterMessageCallback("requestExtensionsData",
75 NewCallback(this, &ExtensionsDOMHandler::HandleRequestExtensionsData)); 75 NewCallback(this, &ExtensionsDOMHandler::HandleRequestExtensionsData));
76 dom_ui_->RegisterMessageCallback("inspect", 76 dom_ui_->RegisterMessageCallback("inspect",
77 NewCallback(this, &ExtensionsDOMHandler::HandleInspectMessage)); 77 NewCallback(this, &ExtensionsDOMHandler::HandleInspectMessage));
78 dom_ui_->RegisterMessageCallback("reload",
79 NewCallback(this, &ExtensionsDOMHandler::HandleReloadMessage));
80 dom_ui_->RegisterMessageCallback("uninstall", 78 dom_ui_->RegisterMessageCallback("uninstall",
81 NewCallback(this, &ExtensionsDOMHandler::HandleUninstallMessage)); 79 NewCallback(this, &ExtensionsDOMHandler::HandleUninstallMessage));
82 } 80 }
83 81
84 void ExtensionsDOMHandler::HandleRequestExtensionsData(const Value* value) { 82 void ExtensionsDOMHandler::HandleRequestExtensionsData(const Value* value) {
85 DictionaryValue results; 83 DictionaryValue results;
86 84
87 // Add the extensions to the results structure. 85 // Add the extensions to the results structure.
88 ListValue *extensions_list = new ListValue(); 86 ListValue *extensions_list = new ListValue();
89 const ExtensionList* extensions = extensions_service_->extensions(); 87 const ExtensionList* extensions = extensions_service_->extensions();
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
122 RenderViewHost* host = RenderViewHost::FromID(render_process_id, 120 RenderViewHost* host = RenderViewHost::FromID(render_process_id,
123 render_view_id); 121 render_view_id);
124 if (!host) { 122 if (!host) {
125 // This can happen if the host has gone away since the page was displayed. 123 // This can happen if the host has gone away since the page was displayed.
126 return; 124 return;
127 } 125 }
128 126
129 DevToolsManager::GetInstance()->OpenDevToolsWindow(host); 127 DevToolsManager::GetInstance()->OpenDevToolsWindow(host);
130 } 128 }
131 129
132 void ExtensionsDOMHandler::HandleReloadMessage(const Value* value) {
133 CHECK(value->IsType(Value::TYPE_LIST));
134 const ListValue* list = static_cast<const ListValue*>(value);
135 CHECK(list->GetSize() == 1);
136 std::string extension_id;
137 CHECK(list->GetString(0, &extension_id));
138 extensions_service_->ReloadExtension(extension_id);
139 }
140
141 void ExtensionsDOMHandler::HandleUninstallMessage(const Value* value) { 130 void ExtensionsDOMHandler::HandleUninstallMessage(const Value* value) {
142 CHECK(value->IsType(Value::TYPE_LIST)); 131 CHECK(value->IsType(Value::TYPE_LIST));
143 const ListValue* list = static_cast<const ListValue*>(value); 132 const ListValue* list = static_cast<const ListValue*>(value);
144 CHECK(list->GetSize() == 1); 133 CHECK(list->GetSize() == 1);
145 std::string extension_id; 134 std::string extension_id;
146 CHECK(list->GetString(0, &extension_id)); 135 CHECK(list->GetString(0, &extension_id));
147 extensions_service_->UninstallExtension(extension_id, false); 136 extensions_service_->UninstallExtension(extension_id, false);
148 } 137 }
149 138
150 static void CreateScriptFileDetailValue( 139 static void CreateScriptFileDetailValue(
(...skipping 118 matching lines...) Expand 10 before | Expand all | Expand 10 after
269 AddMessageHandler(handler); 258 AddMessageHandler(handler);
270 handler->Attach(this); 259 handler->Attach(this);
271 260
272 ExtensionsUIHTMLSource* html_source = new ExtensionsUIHTMLSource(); 261 ExtensionsUIHTMLSource* html_source = new ExtensionsUIHTMLSource();
273 262
274 // Set up the chrome://extensions/ source. 263 // Set up the chrome://extensions/ source.
275 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE, 264 g_browser_process->io_thread()->message_loop()->PostTask(FROM_HERE,
276 NewRunnableMethod(&chrome_url_data_manager, 265 NewRunnableMethod(&chrome_url_data_manager,
277 &ChromeURLDataManager::AddDataSource, html_source)); 266 &ChromeURLDataManager::AddDataSource, html_source));
278 } 267 }
OLDNEW
« no previous file with comments | « chrome/browser/extensions/extensions_ui.h ('k') | chrome/browser/resources/extensions_ui.html » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698