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

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

Issue 242613004: Replace NOTIFICATION_EXTENSION_LOADED to NOTIFICATION_EXTENSION_LOADED_DEPRECATED (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 6 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/command_handler.h" 5 #include "chrome/browser/ui/webui/extensions/command_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/values.h" 8 #include "base/values.h"
9 #include "chrome/browser/chrome_notification_types.h" 9 #include "chrome/browser/chrome_notification_types.h"
10 #include "chrome/browser/extensions/api/commands/command_service.h" 10 #include "chrome/browser/extensions/api/commands/command_service.h"
(...skipping 28 matching lines...) Expand all
39 source->AddString("extensionCommandsDelete", 39 source->AddString("extensionCommandsDelete",
40 l10n_util::GetStringUTF16(IDS_EXTENSION_DELETE_SHORTCUT)); 40 l10n_util::GetStringUTF16(IDS_EXTENSION_DELETE_SHORTCUT));
41 source->AddString("extensionCommandsGlobal", 41 source->AddString("extensionCommandsGlobal",
42 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_GLOBAL)); 42 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_GLOBAL));
43 source->AddString("extensionCommandsRegular", 43 source->AddString("extensionCommandsRegular",
44 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_NOT_GLOBAL)); 44 l10n_util::GetStringUTF16(IDS_EXTENSION_COMMANDS_NOT_GLOBAL));
45 source->AddString("ok", l10n_util::GetStringUTF16(IDS_OK)); 45 source->AddString("ok", l10n_util::GetStringUTF16(IDS_OK));
46 } 46 }
47 47
48 void CommandHandler::RegisterMessages() { 48 void CommandHandler::RegisterMessages() {
49 registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_LOADED, 49 registrar_.Add(this,
50 chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED,
50 content::Source<Profile>(profile_)); 51 content::Source<Profile>(profile_));
51 registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED, 52 registrar_.Add(this, chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED,
52 content::Source<Profile>(profile_)); 53 content::Source<Profile>(profile_));
53 54
54 web_ui()->RegisterMessageCallback("extensionCommandsRequestExtensionsData", 55 web_ui()->RegisterMessageCallback("extensionCommandsRequestExtensionsData",
55 base::Bind(&CommandHandler::HandleRequestExtensionsData, 56 base::Bind(&CommandHandler::HandleRequestExtensionsData,
56 base::Unretained(this))); 57 base::Unretained(this)));
57 web_ui()->RegisterMessageCallback("setShortcutHandlingSuspended", 58 web_ui()->RegisterMessageCallback("setShortcutHandlingSuspended",
58 base::Bind(&CommandHandler::HandleSetShortcutHandlingSuspended, 59 base::Bind(&CommandHandler::HandleSetShortcutHandlingSuspended,
59 base::Unretained(this))); 60 base::Unretained(this)));
60 web_ui()->RegisterMessageCallback("setExtensionCommandShortcut", 61 web_ui()->RegisterMessageCallback("setExtensionCommandShortcut",
61 base::Bind(&CommandHandler::HandleSetExtensionCommandShortcut, 62 base::Bind(&CommandHandler::HandleSetExtensionCommandShortcut,
62 base::Unretained(this))); 63 base::Unretained(this)));
63 web_ui()->RegisterMessageCallback("setCommandScope", 64 web_ui()->RegisterMessageCallback("setCommandScope",
64 base::Bind(&CommandHandler::HandleSetCommandScope, 65 base::Bind(&CommandHandler::HandleSetCommandScope,
65 base::Unretained(this))); 66 base::Unretained(this)));
66 } 67 }
67 68
68 void CommandHandler::Observe( 69 void CommandHandler::Observe(
69 int type, 70 int type,
70 const content::NotificationSource& source, 71 const content::NotificationSource& source,
71 const content::NotificationDetails& details) { 72 const content::NotificationDetails& details) {
72 DCHECK(type == chrome::NOTIFICATION_EXTENSION_LOADED || 73 DCHECK(type == chrome::NOTIFICATION_EXTENSION_LOADED_DEPRECATED ||
73 type == chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED); 74 type == chrome::NOTIFICATION_EXTENSION_UNLOADED_DEPRECATED);
74 UpdateCommandDataOnPage(); 75 UpdateCommandDataOnPage();
75 } 76 }
76 77
77 void CommandHandler::UpdateCommandDataOnPage() { 78 void CommandHandler::UpdateCommandDataOnPage() {
78 base::DictionaryValue results; 79 base::DictionaryValue results;
79 GetAllCommands(&results); 80 GetAllCommands(&results);
80 web_ui()->CallJavascriptFunction( 81 web_ui()->CallJavascriptFunction(
81 "extensions.ExtensionCommandsOverlay.returnExtensionsData", results); 82 "extensions.ExtensionCommandsOverlay.returnExtensionsData", results);
82 } 83 }
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
191 if (!extensions_list->empty()) { 192 if (!extensions_list->empty()) {
192 extension_dict->Set("commands", extensions_list.release()); 193 extension_dict->Set("commands", extensions_list.release());
193 results->Append(extension_dict.release()); 194 results->Append(extension_dict.release());
194 } 195 }
195 } 196 }
196 197
197 commands->Set("commands", results); 198 commands->Set("commands", results);
198 } 199 }
199 200
200 } // namespace extensions 201 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698