Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/extension_context_menu_api.h" | 5 #include "chrome/browser/extensions/extension_context_menu_api.h" |
| 6 | 6 |
| 7 #include <string> | 7 #include <string> |
| 8 | 8 |
| 9 #include "base/values.h" | 9 #include "base/values.h" |
| 10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 58 } else if (value == "link") { | 58 } else if (value == "link") { |
| 59 tmp_result.Add(ExtensionMenuItem::LINK); | 59 tmp_result.Add(ExtensionMenuItem::LINK); |
| 60 } else if (value == "editable") { | 60 } else if (value == "editable") { |
| 61 tmp_result.Add(ExtensionMenuItem::EDITABLE); | 61 tmp_result.Add(ExtensionMenuItem::EDITABLE); |
| 62 } else if (value == "image") { | 62 } else if (value == "image") { |
| 63 tmp_result.Add(ExtensionMenuItem::IMAGE); | 63 tmp_result.Add(ExtensionMenuItem::IMAGE); |
| 64 } else if (value == "video") { | 64 } else if (value == "video") { |
| 65 tmp_result.Add(ExtensionMenuItem::VIDEO); | 65 tmp_result.Add(ExtensionMenuItem::VIDEO); |
| 66 } else if (value == "audio") { | 66 } else if (value == "audio") { |
| 67 tmp_result.Add(ExtensionMenuItem::AUDIO); | 67 tmp_result.Add(ExtensionMenuItem::AUDIO); |
| 68 } else if (value == "file") { | |
| 69 tmp_result.Add(ExtensionMenuItem::FILE); | |
|
asargent_no_longer_on_chrome
2011/04/08 18:52:33
As a heads up, you'll get a merge conflict with ht
zel
2011/04/08 19:35:01
I know. He added "frame" - it's just below. I have
| |
| 68 } else if (value == "frame") { | 70 } else if (value == "frame") { |
| 69 tmp_result.Add(ExtensionMenuItem::FRAME); | 71 tmp_result.Add(ExtensionMenuItem::FRAME); |
| 70 } else { | 72 } else { |
| 71 error_ = ExtensionErrorUtils::FormatErrorMessage(kInvalidValueError, key); | 73 error_ = ExtensionErrorUtils::FormatErrorMessage(kInvalidValueError, key); |
| 72 return false; | 74 return false; |
| 73 } | 75 } |
| 74 } | 76 } |
| 75 *result = tmp_result; | 77 *result = tmp_result; |
| 76 return true; | 78 return true; |
| 77 } | 79 } |
| (...skipping 274 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 352 | 354 |
| 353 return manager->RemoveContextMenuItem(id); | 355 return manager->RemoveContextMenuItem(id); |
| 354 } | 356 } |
| 355 | 357 |
| 356 bool RemoveAllContextMenusFunction::RunImpl() { | 358 bool RemoveAllContextMenusFunction::RunImpl() { |
| 357 ExtensionService* service = profile()->GetExtensionService(); | 359 ExtensionService* service = profile()->GetExtensionService(); |
| 358 ExtensionMenuManager* manager = service->menu_manager(); | 360 ExtensionMenuManager* manager = service->menu_manager(); |
| 359 manager->RemoveAllContextItems(extension_id()); | 361 manager->RemoveAllContextItems(extension_id()); |
| 360 return true; | 362 return true; |
| 361 } | 363 } |
| OLD | NEW |