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/pepper_flash_settings_manager.h" | 5 #include "chrome/browser/pepper_flash_settings_manager.h" |
6 | 6 |
7 #include <map> | 7 #include <map> |
8 #include <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
75 GET_SITES_WITH_DATA, | 75 GET_SITES_WITH_DATA, |
76 CLEAR_SITE_DATA, | 76 CLEAR_SITE_DATA, |
77 }; | 77 }; |
78 | 78 |
79 struct PendingRequest { | 79 struct PendingRequest { |
80 PendingRequest() | 80 PendingRequest() |
81 : id(0), | 81 : id(0), |
82 type(INVALID_REQUEST_TYPE), | 82 type(INVALID_REQUEST_TYPE), |
83 setting_type(PP_FLASH_BROWSEROPERATIONS_SETTINGTYPE_CAMERAMIC), | 83 setting_type(PP_FLASH_BROWSEROPERATIONS_SETTINGTYPE_CAMERAMIC), |
84 permission(PP_FLASH_BROWSEROPERATIONS_PERMISSION_DEFAULT), | 84 permission(PP_FLASH_BROWSEROPERATIONS_PERMISSION_DEFAULT), |
85 clear_site_specific(false) { | 85 clear_site_specific(false), |
| 86 flags(0), |
| 87 max_age(0) { |
86 } | 88 } |
87 | 89 |
88 uint32 id; | 90 uint32 id; |
89 RequestType type; | 91 RequestType type; |
90 | 92 |
91 // Used by GET_PERMISSION_SETTINGS, SET_DEFAULT_PERMISSION and | 93 // Used by GET_PERMISSION_SETTINGS, SET_DEFAULT_PERMISSION and |
92 // SET_SITE_PERMISSION. | 94 // SET_SITE_PERMISSION. |
93 PP_Flash_BrowserOperations_SettingType setting_type; | 95 PP_Flash_BrowserOperations_SettingType setting_type; |
94 | 96 |
95 // Used by SET_DEFAULT_PERMISSION. | 97 // Used by SET_DEFAULT_PERMISSION. |
(...skipping 886 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
982 | 984 |
983 void PepperFlashSettingsManager::OnError() { | 985 void PepperFlashSettingsManager::OnError() { |
984 if (core_.get()) { | 986 if (core_.get()) { |
985 core_->Detach(); | 987 core_->Detach(); |
986 core_ = NULL; | 988 core_ = NULL; |
987 } else { | 989 } else { |
988 NOTREACHED(); | 990 NOTREACHED(); |
989 } | 991 } |
990 } | 992 } |
991 | 993 |
OLD | NEW |