OLD | NEW |
---|---|
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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/api/chrome_extensions_api_client.h" | 5 #include "chrome/browser/extensions/api/chrome_extensions_api_client.h" |
6 | 6 |
7 #include "base/files/file_path.h" | 7 #include "base/files/file_path.h" |
8 #include "chrome/browser/extensions/api/storage/sync_value_store_cache.h" | 8 #include "chrome/browser/extensions/api/storage/sync_value_store_cache.h" |
9 #include "chrome/browser/guest_view/app_view/app_view_guest.h" | |
10 #include "content/public/browser/browser_context.h" | 9 #include "content/public/browser/browser_context.h" |
11 #include "content/public/browser/browser_thread.h" | 10 #include "content/public/browser/browser_thread.h" |
12 #include "device/hid/hid_service.h" | 11 #include "device/hid/hid_service.h" |
13 | 12 |
14 #if defined(ENABLE_CONFIGURATION_POLICY) | 13 #if defined(ENABLE_CONFIGURATION_POLICY) |
15 #include "chrome/browser/extensions/api/storage/managed_value_store_cache.h" | 14 #include "chrome/browser/extensions/api/storage/managed_value_store_cache.h" |
16 #endif | 15 #endif |
17 | 16 |
17 #if defined(ENABLE_EXTENSIONS) | |
18 #include "chrome/browser/guest_view/app_view/app_view_guest.h" | |
19 #include "chrome/browser/guest_view/extension_options/extension_options_guest.h" | |
20 #include "chrome/browser/guest_view/web_view/web_view_guest.h" | |
21 #endif | |
22 | |
18 namespace extensions { | 23 namespace extensions { |
19 | 24 |
20 ChromeExtensionsAPIClient::ChromeExtensionsAPIClient() {} | 25 ChromeExtensionsAPIClient::ChromeExtensionsAPIClient() {} |
21 | 26 |
22 ChromeExtensionsAPIClient::~ChromeExtensionsAPIClient() {} | 27 ChromeExtensionsAPIClient::~ChromeExtensionsAPIClient() {} |
23 | 28 |
24 void ChromeExtensionsAPIClient::AddAdditionalValueStoreCaches( | 29 void ChromeExtensionsAPIClient::AddAdditionalValueStoreCaches( |
25 content::BrowserContext* context, | 30 content::BrowserContext* context, |
26 const scoped_refptr<SettingsStorageFactory>& factory, | 31 const scoped_refptr<SettingsStorageFactory>& factory, |
27 const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >& observers, | 32 const scoped_refptr<ObserverListThreadSafe<SettingsObserver> >& observers, |
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
60 | 65 |
61 device::HidService* ChromeExtensionsAPIClient::GetHidService() { | 66 device::HidService* ChromeExtensionsAPIClient::GetHidService() { |
62 if (!hid_service_) { | 67 if (!hid_service_) { |
63 hid_service_.reset(device::HidService::Create( | 68 hid_service_.reset(device::HidService::Create( |
64 content::BrowserThread::GetMessageLoopProxyForThread( | 69 content::BrowserThread::GetMessageLoopProxyForThread( |
65 content::BrowserThread::UI))); | 70 content::BrowserThread::UI))); |
66 } | 71 } |
67 return hid_service_.get(); | 72 return hid_service_.get(); |
68 } | 73 } |
69 | 74 |
75 void ChromeExtensionsAPIClient::RegisterGuestViewType() { | |
76 AppViewGuest::Register(); | |
Ken Rockot(use gerrit already)
2014/08/07 22:37:40
Please also wrap these Register() calls in an #if
Xi Han
2014/08/08 14:12:11
Wait a second. It is safe to add #if defined(ENABL
| |
77 ExtensionOptionsGuest::Register(); | |
78 WebViewGuest::Register(); | |
79 } | |
80 | |
70 } // namespace extensions | 81 } // namespace extensions |
OLD | NEW |