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

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

Issue 10909256: Always send the full tab object in ExtensionAction click event. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: kalments Created 8 years, 3 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
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/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 625 matching lines...) Expand 10 before | Expand all | Expand 10 after
636 properties->SetString("selectionText", params.selection_text); 636 properties->SetString("selectionText", params.selection_text);
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, extension)); 647 args->Append(ExtensionTabUtil::CreateTabValue(
648 else 648 web_contents, ExtensionTabUtil::INCLUDE_PRIVACY_SENSITIVE_FIELDS));
649 } else {
649 args->Append(new DictionaryValue()); 650 args->Append(new DictionaryValue());
651 }
650 } 652 }
651 653
652 if (item->type() == MenuItem::CHECKBOX || 654 if (item->type() == MenuItem::CHECKBOX ||
653 item->type() == MenuItem::RADIO) { 655 item->type() == MenuItem::RADIO) {
654 bool was_checked = item->checked(); 656 bool was_checked = item->checked();
655 properties->SetBoolean("wasChecked", was_checked); 657 properties->SetBoolean("wasChecked", was_checked);
656 658
657 // RADIO items always get set to true when you click on them, but CHECKBOX 659 // RADIO items always get set to true when you click on them, but CHECKBOX
658 // items get their state toggled. 660 // items get their state toggled.
659 bool checked = 661 bool checked =
(...skipping 180 matching lines...) Expand 10 before | Expand all | Expand 10 after
840 if (uid < other.uid) 842 if (uid < other.uid)
841 return true; 843 return true;
842 if (uid == other.uid) 844 if (uid == other.uid)
843 return string_uid < other.string_uid; 845 return string_uid < other.string_uid;
844 } 846 }
845 } 847 }
846 return false; 848 return false;
847 } 849 }
848 850
849 } // namespace extensions 851 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698