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

Side by Side Diff: chrome/browser/ui/ash/ash_keyboard_controller_proxy.cc

Issue 709813004: Remove the deprecated function ExtensionService::extensions(). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix Chrome OS compile failure. Created 6 years, 1 month 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 (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/browser/ui/ash/ash_keyboard_controller_proxy.h" 5 #include "chrome/browser/ui/ash/ash_keyboard_controller_proxy.h"
6 6
7 #include "ash/display/display_controller.h" 7 #include "ash/display/display_controller.h"
8 #include "ash/shell.h" 8 #include "ash/shell.h"
9 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h" 9 #include "chrome/browser/extensions/chrome_extension_web_contents_observer.h"
10 #include "chrome/browser/extensions/extension_service.h"
11 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 10 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
12 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
13 #include "chrome/browser/profiles/profile_manager.h" 12 #include "chrome/browser/profiles/profile_manager.h"
14 #include "content/public/browser/site_instance.h" 13 #include "content/public/browser/site_instance.h"
15 #include "content/public/browser/web_contents.h" 14 #include "content/public/browser/web_contents.h"
16 #include "extensions/browser/event_router.h" 15 #include "extensions/browser/event_router.h"
17 #include "extensions/browser/extension_function_dispatcher.h" 16 #include "extensions/browser/extension_function_dispatcher.h"
18 #include "extensions/browser/extension_system.h" 17 #include "extensions/browser/extension_registry.h"
19 #include "extensions/browser/view_type_utils.h" 18 #include "extensions/browser/view_type_utils.h"
20 #include "extensions/common/api/virtual_keyboard_private.h" 19 #include "extensions/common/api/virtual_keyboard_private.h"
21 #include "extensions/common/constants.h" 20 #include "extensions/common/constants.h"
22 #include "extensions/common/extension_messages.h" 21 #include "extensions/common/extension_messages.h"
23 #include "ipc/ipc_message_macros.h" 22 #include "ipc/ipc_message_macros.h"
24 #include "ui/aura/client/aura_constants.h" 23 #include "ui/aura/client/aura_constants.h"
25 #include "ui/aura/window.h" 24 #include "ui/aura/window.h"
26 #include "ui/aura/window_event_dispatcher.h" 25 #include "ui/aura/window_event_dispatcher.h"
27 #include "ui/compositor/scoped_layer_animation_settings.h" 26 #include "ui/compositor/scoped_layer_animation_settings.h"
28 #include "ui/keyboard/keyboard_controller.h" 27 #include "ui/keyboard/keyboard_controller.h"
(...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 return root_window->GetProperty(aura::client::kRootWindowInputMethodKey); 89 return root_window->GetProperty(aura::client::kRootWindowInputMethodKey);
91 } 90 }
92 91
93 void AshKeyboardControllerProxy::RequestAudioInput( 92 void AshKeyboardControllerProxy::RequestAudioInput(
94 content::WebContents* web_contents, 93 content::WebContents* web_contents,
95 const content::MediaStreamRequest& request, 94 const content::MediaStreamRequest& request,
96 const content::MediaResponseCallback& callback) { 95 const content::MediaResponseCallback& callback) {
97 const extensions::Extension* extension = NULL; 96 const extensions::Extension* extension = NULL;
98 GURL origin(request.security_origin); 97 GURL origin(request.security_origin);
99 if (origin.SchemeIs(extensions::kExtensionScheme)) { 98 if (origin.SchemeIs(extensions::kExtensionScheme)) {
100 ExtensionService* extensions_service = 99 const extensions::ExtensionRegistry* registry =
101 extensions::ExtensionSystem::Get( 100 extensions::ExtensionRegistry::Get(GetBrowserContext());
102 GetBrowserContext())->extension_service(); 101 extension = registry->enabled_extensions().GetByID(origin.host());
103 extension = extensions_service->extensions()->GetByID(origin.host());
104 DCHECK(extension); 102 DCHECK(extension);
105 } 103 }
106 104
107 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( 105 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
108 web_contents, request, callback, extension); 106 web_contents, request, callback, extension);
109 } 107 }
110 108
111 void AshKeyboardControllerProxy::SetupWebContents( 109 void AshKeyboardControllerProxy::SetupWebContents(
112 content::WebContents* contents) { 110 content::WebContents* contents) {
113 extension_function_dispatcher_.reset( 111 extension_function_dispatcher_.reset(
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 input_context->SetString("type", 163 input_context->SetString("type",
166 Context::ToString(TextInputTypeToGeneratedInputTypeEnum(type))); 164 Context::ToString(TextInputTypeToGeneratedInputTypeEnum(type)));
167 event_args->Append(input_context.release()); 165 event_args->Append(input_context.release());
168 166
169 scoped_ptr<extensions::Event> event(new extensions::Event( 167 scoped_ptr<extensions::Event> event(new extensions::Event(
170 virtual_keyboard_private::OnTextInputBoxFocused::kEventName, 168 virtual_keyboard_private::OnTextInputBoxFocused::kEventName,
171 event_args.Pass())); 169 event_args.Pass()));
172 event->restrict_to_browser_context = context; 170 event->restrict_to_browser_context = context;
173 router->DispatchEventToExtension(kVirtualKeyboardExtensionID, event.Pass()); 171 router->DispatchEventToExtension(kVirtualKeyboardExtensionID, event.Pass());
174 } 172 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698