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 |
11 #include "base/bind.h" | 11 #include "base/bind.h" |
12 #include "base/compiler_specific.h" | 12 #include "base/compiler_specific.h" |
13 #include "base/files/file_util.h" | 13 #include "base/files/file_util.h" |
14 #include "base/prefs/pref_service.h" | |
15 #include "base/sequenced_task_runner_helpers.h" | 14 #include "base/sequenced_task_runner_helpers.h" |
16 #include "base/strings/utf_string_conversions.h" | 15 #include "base/strings/utf_string_conversions.h" |
17 #include "build/build_config.h" | 16 #include "build/build_config.h" |
18 #include "chrome/browser/plugins/plugin_prefs.h" | 17 #include "chrome/browser/plugins/plugin_prefs.h" |
19 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
20 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" | 19 #include "chrome/browser/renderer_host/pepper/device_id_fetcher.h" |
21 #include "chrome/common/pref_names.h" | 20 #include "chrome/common/pref_names.h" |
22 #include "components/pref_registry/pref_registry_syncable.h" | 21 #include "components/pref_registry/pref_registry_syncable.h" |
| 22 #include "components/prefs/pref_service.h" |
23 #include "content/public/browser/browser_context.h" | 23 #include "content/public/browser/browser_context.h" |
24 #include "content/public/browser/browser_thread.h" | 24 #include "content/public/browser/browser_thread.h" |
25 #include "content/public/browser/pepper_flash_settings_helper.h" | 25 #include "content/public/browser/pepper_flash_settings_helper.h" |
26 #include "content/public/browser/plugin_service.h" | 26 #include "content/public/browser/plugin_service.h" |
27 #include "content/public/common/content_constants.h" | 27 #include "content/public/common/content_constants.h" |
28 #include "content/public/common/webplugininfo.h" | 28 #include "content/public/common/webplugininfo.h" |
29 #include "ipc/ipc_channel.h" | 29 #include "ipc/ipc_channel.h" |
30 #include "ipc/ipc_listener.h" | 30 #include "ipc/ipc_listener.h" |
31 #include "ppapi/proxy/ppapi_messages.h" | 31 #include "ppapi/proxy/ppapi_messages.h" |
32 #include "url/gurl.h" | 32 #include "url/gurl.h" |
(...skipping 1023 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1056 } | 1056 } |
1057 | 1057 |
1058 void PepperFlashSettingsManager::OnError(Core* core) { | 1058 void PepperFlashSettingsManager::OnError(Core* core) { |
1059 DCHECK(core); | 1059 DCHECK(core); |
1060 if (core != core_.get()) | 1060 if (core != core_.get()) |
1061 return; | 1061 return; |
1062 | 1062 |
1063 core_->Detach(); | 1063 core_->Detach(); |
1064 core_ = NULL; | 1064 core_ = NULL; |
1065 } | 1065 } |
OLD | NEW |