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

Side by Side Diff: chrome/common/extensions/permissions/permissions_data.cc

Issue 18854021: Making the extension permissions dialog scrollable, when needed (adding expandable sections for thi… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Polish Created 7 years, 5 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) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/common/extensions/permissions/permissions_data.h" 5 #include "chrome/common/extensions/permissions/permissions_data.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/memory/scoped_ptr.h" 8 #include "base/memory/scoped_ptr.h"
9 #include "base/strings/string16.h" 9 #include "base/strings/string16.h"
10 #include "base/strings/string_number_conversions.h" 10 #include "base/strings/string_number_conversions.h"
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_); 437 base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
438 if (ShouldSkipPermissionWarnings(extension)) { 438 if (ShouldSkipPermissionWarnings(extension)) {
439 return std::vector<string16>(); 439 return std::vector<string16>();
440 } else { 440 } else {
441 return GetActivePermissions(extension)->GetWarningMessages( 441 return GetActivePermissions(extension)->GetWarningMessages(
442 extension->GetType()); 442 extension->GetType());
443 } 443 }
444 } 444 }
445 445
446 // static 446 // static
447 std::vector<string16> PermissionsData::GetPermissionMessageDetailsStrings(
448 const Extension* extension) {
449 base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
450 if (ShouldSkipPermissionWarnings(extension)) {
451 return std::vector<string16>();
452 } else {
453 return GetActivePermissions(extension)->GetWarningMessagesDetails(
454 extension->GetType());
455 }
456 }
457
458 // static
447 bool PermissionsData::CanExecuteScriptOnPage(const Extension* extension, 459 bool PermissionsData::CanExecuteScriptOnPage(const Extension* extension,
448 const GURL& document_url, 460 const GURL& document_url,
449 const GURL& top_frame_url, 461 const GURL& top_frame_url,
450 int tab_id, 462 int tab_id,
451 const UserScript* script, 463 const UserScript* script,
452 int process_id, 464 int process_id,
453 std::string* error) { 465 std::string* error) {
454 base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_); 466 base::AutoLock auto_lock(extension->permissions_data()->runtime_lock_);
455 // The gallery is special-cased as a restricted URL for scripting to prevent 467 // The gallery is special-cased as a restricted URL for scripting to prevent
456 // access to special JS bindings we expose to the gallery (and avoid things 468 // access to special JS bindings we expose to the gallery (and avoid things
(...skipping 164 matching lines...) Expand 10 before | Expand all | Expand 10 after
621 optional_permission_set_ = new PermissionSet( 633 optional_permission_set_ = new PermissionSet(
622 initial_optional_permissions_->api_permissions, 634 initial_optional_permissions_->api_permissions,
623 initial_optional_permissions_->host_permissions, 635 initial_optional_permissions_->host_permissions,
624 URLPatternSet()); 636 URLPatternSet());
625 637
626 initial_required_permissions_.reset(); 638 initial_required_permissions_.reset();
627 initial_optional_permissions_.reset(); 639 initial_optional_permissions_.reset();
628 } 640 }
629 641
630 } // namespace extensions 642 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698