OLD | NEW |
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/extensions/menu_manager.h" | 5 #include "chrome/browser/extensions/menu_manager.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/json/json_writer.h" | 9 #include "base/json/json_writer.h" |
10 #include "base/logging.h" | 10 #include "base/logging.h" |
(...skipping 626 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
637 | 637 |
638 properties->SetBoolean("editable", params.is_editable); | 638 properties->SetBoolean("editable", params.is_editable); |
639 | 639 |
640 args->Append(properties); | 640 args->Append(properties); |
641 | 641 |
642 // Add the tab info to the argument list. | 642 // Add the tab info to the argument list. |
643 // No tab info in a platform app. | 643 // No tab info in a platform app. |
644 if (!extension || !extension->is_platform_app()) { | 644 if (!extension || !extension->is_platform_app()) { |
645 // Note: web_contents are NULL in unit tests :( | 645 // Note: web_contents are NULL in unit tests :( |
646 if (web_contents) { | 646 if (web_contents) { |
647 args->Append(ExtensionTabUtil::CreateTabValue(web_contents)); | 647 args->Append(ExtensionTabUtil::CreateTabValue( |
| 648 web_contents, ExtensionTabUtil::INCLUDE_PRIVACY_SENSITIVE_FIELDS)); |
648 } else { | 649 } else { |
649 args->Append(new DictionaryValue()); | 650 args->Append(new DictionaryValue()); |
650 } | 651 } |
651 } | 652 } |
652 | 653 |
653 if (item->type() == MenuItem::CHECKBOX || | 654 if (item->type() == MenuItem::CHECKBOX || |
654 item->type() == MenuItem::RADIO) { | 655 item->type() == MenuItem::RADIO) { |
655 bool was_checked = item->checked(); | 656 bool was_checked = item->checked(); |
656 properties->SetBoolean("wasChecked", was_checked); | 657 properties->SetBoolean("wasChecked", was_checked); |
657 | 658 |
(...skipping 207 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
865 if (uid < other.uid) | 866 if (uid < other.uid) |
866 return true; | 867 return true; |
867 if (uid == other.uid) | 868 if (uid == other.uid) |
868 return string_uid < other.string_uid; | 869 return string_uid < other.string_uid; |
869 } | 870 } |
870 } | 871 } |
871 return false; | 872 return false; |
872 } | 873 } |
873 | 874 |
874 } // namespace extensions | 875 } // namespace extensions |
OLD | NEW |