OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/base64.h" | 9 #include "base/base64.h" |
10 #include "base/callback.h" | 10 #include "base/callback.h" |
11 #include "base/file_util.h" | 11 #include "base/file_util.h" |
12 #include "base/string_util.h" | 12 #include "base/string_util.h" |
13 #include "base/thread.h" | 13 #include "base/thread.h" |
14 #include "chrome/browser/browser.h" | 14 #include "chrome/browser/browser.h" |
15 #include "chrome/browser/browser_process.h" | 15 #include "chrome/browser/browser_process.h" |
16 #include "chrome/browser/debugger/devtools_manager.h" | 16 #include "chrome/browser/debugger/devtools_manager.h" |
| 17 #include "chrome/browser/debugger/devtools_toggle_action.h" |
17 #include "chrome/browser/extensions/crx_installer.h" | 18 #include "chrome/browser/extensions/crx_installer.h" |
18 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" | 19 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" |
19 #include "chrome/browser/extensions/extension_error_reporter.h" | 20 #include "chrome/browser/extensions/extension_error_reporter.h" |
20 #include "chrome/browser/extensions/extension_function_dispatcher.h" | 21 #include "chrome/browser/extensions/extension_function_dispatcher.h" |
21 #include "chrome/browser/extensions/extension_host.h" | 22 #include "chrome/browser/extensions/extension_host.h" |
22 #include "chrome/browser/extensions/extension_message_service.h" | 23 #include "chrome/browser/extensions/extension_message_service.h" |
23 #include "chrome/browser/extensions/extensions_service.h" | 24 #include "chrome/browser/extensions/extensions_service.h" |
24 #include "chrome/browser/extensions/extension_updater.h" | 25 #include "chrome/browser/extensions/extension_updater.h" |
25 #include "chrome/browser/google_util.h" | 26 #include "chrome/browser/google_util.h" |
26 #include "chrome/browser/pref_service.h" | 27 #include "chrome/browser/pref_service.h" |
(...skipping 402 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
429 CHECK(list->GetString(1, &render_view_id_str)); | 430 CHECK(list->GetString(1, &render_view_id_str)); |
430 CHECK(StringToInt(render_process_id_str, &render_process_id)); | 431 CHECK(StringToInt(render_process_id_str, &render_process_id)); |
431 CHECK(StringToInt(render_view_id_str, &render_view_id)); | 432 CHECK(StringToInt(render_view_id_str, &render_view_id)); |
432 RenderViewHost* host = RenderViewHost::FromID(render_process_id, | 433 RenderViewHost* host = RenderViewHost::FromID(render_process_id, |
433 render_view_id); | 434 render_view_id); |
434 if (!host) { | 435 if (!host) { |
435 // This can happen if the host has gone away since the page was displayed. | 436 // This can happen if the host has gone away since the page was displayed. |
436 return; | 437 return; |
437 } | 438 } |
438 | 439 |
439 DevToolsManager::GetInstance()->ToggleDevToolsWindow(host, true); | 440 DevToolsManager::GetInstance()->ToggleDevToolsWindow( |
| 441 host, |
| 442 DEVTOOLS_TOGGLE_ACTION_SHOW_CONSOLE); |
440 } | 443 } |
441 | 444 |
442 void ExtensionsDOMHandler::HandleReloadMessage(const Value* value) { | 445 void ExtensionsDOMHandler::HandleReloadMessage(const Value* value) { |
443 CHECK(value->IsType(Value::TYPE_LIST)); | 446 CHECK(value->IsType(Value::TYPE_LIST)); |
444 const ListValue* list = static_cast<const ListValue*>(value); | 447 const ListValue* list = static_cast<const ListValue*>(value); |
445 CHECK(list->GetSize() == 1); | 448 CHECK(list->GetSize() == 1); |
446 std::string extension_id; | 449 std::string extension_id; |
447 CHECK(list->GetString(0, &extension_id)); | 450 CHECK(list->GetString(0, &extension_id)); |
448 extensions_service_->ReloadExtension(extension_id); | 451 extensions_service_->ReloadExtension(extension_id); |
449 } | 452 } |
(...skipping 488 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
938 // static | 941 // static |
939 RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() { | 942 RefCountedMemory* ExtensionsUI::GetFaviconResourceBytes() { |
940 return ResourceBundle::GetSharedInstance(). | 943 return ResourceBundle::GetSharedInstance(). |
941 LoadDataResourceBytes(IDR_PLUGIN); | 944 LoadDataResourceBytes(IDR_PLUGIN); |
942 } | 945 } |
943 | 946 |
944 // static | 947 // static |
945 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) { | 948 void ExtensionsUI::RegisterUserPrefs(PrefService* prefs) { |
946 prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, false); | 949 prefs->RegisterBooleanPref(prefs::kExtensionsUIDeveloperMode, false); |
947 } | 950 } |
OLD | NEW |