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

Side by Side Diff: chrome/browser/extensions/api/chrome_extensions_api_client.cc

Issue 523743005: Fix HidService lifetime issues (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: where did that stupid line come from Created 6 years, 3 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
OLDNEW
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/chrome_app_view_guest_delegate.h" 9 #include "chrome/browser/guest_view/app_view/chrome_app_view_guest_delegate.h"
10 #include "chrome/browser/guest_view/extension_options/extension_options_guest.h" 10 #include "chrome/browser/guest_view/extension_options/extension_options_guest.h"
11 #include "chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h" 11 #include "chrome/browser/guest_view/web_view/chrome_web_view_guest_delegate.h"
12 #include "chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_d elegate.h" 12 #include "chrome/browser/guest_view/web_view/chrome_web_view_permission_helper_d elegate.h"
13 #include "content/public/browser/browser_context.h" 13 #include "content/public/browser/browser_context.h"
14 #include "content/public/browser/browser_thread.h" 14 #include "content/public/browser/browser_thread.h"
15 #include "device/hid/hid_service.h"
16 #include "extensions/browser/guest_view/app_view/app_view_guest.h" 15 #include "extensions/browser/guest_view/app_view/app_view_guest.h"
17 #include "extensions/browser/guest_view/web_view/web_view_guest.h" 16 #include "extensions/browser/guest_view/web_view/web_view_guest.h"
18 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h" 17 #include "extensions/browser/guest_view/web_view/web_view_permission_helper.h"
19 18
20 #if defined(ENABLE_CONFIGURATION_POLICY) 19 #if defined(ENABLE_CONFIGURATION_POLICY)
21 #include "chrome/browser/extensions/api/storage/managed_value_store_cache.h" 20 #include "chrome/browser/extensions/api/storage/managed_value_store_cache.h"
22 #endif 21 #endif
23 22
24 namespace extensions { 23 namespace extensions {
25 24
(...skipping 26 matching lines...) Expand all
52 WebViewGuest* web_view_guest) const { 51 WebViewGuest* web_view_guest) const {
53 return new ChromeWebViewGuestDelegate(web_view_guest); 52 return new ChromeWebViewGuestDelegate(web_view_guest);
54 } 53 }
55 54
56 WebViewPermissionHelperDelegate* ChromeExtensionsAPIClient:: 55 WebViewPermissionHelperDelegate* ChromeExtensionsAPIClient::
57 CreateWebViewPermissionHelperDelegate( 56 CreateWebViewPermissionHelperDelegate(
58 WebViewPermissionHelper* web_view_permission_helper) const { 57 WebViewPermissionHelper* web_view_permission_helper) const {
59 return new ChromeWebViewPermissionHelperDelegate(web_view_permission_helper); 58 return new ChromeWebViewPermissionHelperDelegate(web_view_permission_helper);
60 } 59 }
61 60
62 device::HidService* ChromeExtensionsAPIClient::GetHidService() {
63 if (!hid_service_) {
64 hid_service_.reset(device::HidService::Create(
65 content::BrowserThread::GetMessageLoopProxyForThread(
66 content::BrowserThread::UI)));
67 }
68 return hid_service_.get();
69 }
70
71 void ChromeExtensionsAPIClient::RegisterGuestViewTypes() { 61 void ChromeExtensionsAPIClient::RegisterGuestViewTypes() {
72 ExtensionOptionsGuest::Register(); 62 ExtensionOptionsGuest::Register();
73 } 63 }
74 64
75 } // namespace extensions 65 } // namespace extensions
OLDNEW
« no previous file with comments | « chrome/browser/extensions/api/chrome_extensions_api_client.h ('k') | device/core/device_client.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698