| OLD | NEW | 
|    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/string16.h" |    9 #include "base/string16.h" | 
|   10 #include "base/stringprintf.h" |   10 #include "base/stringprintf.h" | 
| (...skipping 330 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  341 // static |  341 // static | 
|  342 void PermissionsData::UpdateTabSpecificPermissions( |  342 void PermissionsData::UpdateTabSpecificPermissions( | 
|  343     const Extension* extension, |  343     const Extension* extension, | 
|  344     int tab_id, |  344     int tab_id, | 
|  345     scoped_refptr<const PermissionSet> permissions) { |  345     scoped_refptr<const PermissionSet> permissions) { | 
|  346   CHECK_GE(tab_id, 0); |  346   CHECK_GE(tab_id, 0); | 
|  347   TabPermissionsMap* tab_permissions = |  347   TabPermissionsMap* tab_permissions = | 
|  348       &extension->permissions_data()->tab_specific_permissions_; |  348       &extension->permissions_data()->tab_specific_permissions_; | 
|  349   if (tab_permissions->count(tab_id)) { |  349   if (tab_permissions->count(tab_id)) { | 
|  350     (*tab_permissions)[tab_id] = PermissionSet::CreateUnion( |  350     (*tab_permissions)[tab_id] = PermissionSet::CreateUnion( | 
|  351         (*tab_permissions)[tab_id], |  351         (*tab_permissions)[tab_id].get(), permissions.get()); | 
|  352         permissions.get()); |  | 
|  353   } else { |  352   } else { | 
|  354     (*tab_permissions)[tab_id] = permissions; |  353     (*tab_permissions)[tab_id] = permissions; | 
|  355   } |  354   } | 
|  356 } |  355 } | 
|  357  |  356  | 
|  358 // static |  357 // static | 
|  359 void PermissionsData::ClearTabSpecificPermissions( |  358 void PermissionsData::ClearTabSpecificPermissions( | 
|  360     const Extension* extension, |  359     const Extension* extension, | 
|  361     int tab_id) { |  360     int tab_id) { | 
|  362   CHECK_GE(tab_id, 0); |  361   CHECK_GE(tab_id, 0); | 
| (...skipping 277 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  640   optional_permission_set_ = new PermissionSet( |  639   optional_permission_set_ = new PermissionSet( | 
|  641       initial_optional_permissions_->api_permissions, |  640       initial_optional_permissions_->api_permissions, | 
|  642       initial_optional_permissions_->host_permissions, |  641       initial_optional_permissions_->host_permissions, | 
|  643       URLPatternSet()); |  642       URLPatternSet()); | 
|  644  |  643  | 
|  645   initial_required_permissions_.reset(); |  644   initial_required_permissions_.reset(); | 
|  646   initial_optional_permissions_.reset(); |  645   initial_optional_permissions_.reset(); | 
|  647 } |  646 } | 
|  648  |  647  | 
|  649 }  // namespace extensions |  648 }  // namespace extensions | 
| OLD | NEW |