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

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

Issue 147923005: Split ExtensionSystem interface from ExtensionSystemImpl implementation, part 1. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: re^3base Created 6 years, 10 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 | Annotate | Revision Log
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/event_names.h" 9 #include "chrome/browser/extensions/event_names.h"
10 #include "chrome/browser/extensions/extension_function_dispatcher.h" 10 #include "chrome/browser/extensions/extension_function_dispatcher.h"
11 #include "chrome/browser/extensions/extension_service.h" 11 #include "chrome/browser/extensions/extension_service.h"
12 #include "chrome/browser/extensions/extension_system.h"
13 #include "chrome/browser/extensions/extension_web_contents_observer.h" 12 #include "chrome/browser/extensions/extension_web_contents_observer.h"
14 #include "chrome/browser/media/media_capture_devices_dispatcher.h" 13 #include "chrome/browser/media/media_capture_devices_dispatcher.h"
15 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
16 #include "chrome/browser/profiles/profile_manager.h" 15 #include "chrome/browser/profiles/profile_manager.h"
17 #include "chrome/common/extensions/api/virtual_keyboard_private.h" 16 #include "chrome/common/extensions/api/virtual_keyboard_private.h"
18 #include "chrome/common/extensions/extension_messages.h" 17 #include "chrome/common/extensions/extension_messages.h"
19 #include "content/public/browser/site_instance.h" 18 #include "content/public/browser/site_instance.h"
20 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
21 #include "content/public/browser/web_contents_view.h" 20 #include "content/public/browser/web_contents_view.h"
22 #include "extensions/browser/event_router.h" 21 #include "extensions/browser/event_router.h"
22 #include "extensions/browser/extension_system.h"
23 #include "extensions/browser/view_type_utils.h" 23 #include "extensions/browser/view_type_utils.h"
24 #include "extensions/common/constants.h" 24 #include "extensions/common/constants.h"
25 #include "ipc/ipc_message_macros.h" 25 #include "ipc/ipc_message_macros.h"
26 #include "ui/aura/client/aura_constants.h" 26 #include "ui/aura/client/aura_constants.h"
27 #include "ui/aura/root_window.h" 27 #include "ui/aura/root_window.h"
28 #include "ui/aura/window.h" 28 #include "ui/aura/window.h"
29 #include "ui/base/ime/input_method.h" 29 #include "ui/base/ime/input_method.h"
30 #include "ui/base/ime/text_input_client.h" 30 #include "ui/base/ime/text_input_client.h"
31 #include "ui/compositor/scoped_layer_animation_settings.h" 31 #include "ui/compositor/scoped_layer_animation_settings.h"
32 #include "ui/keyboard/keyboard_controller.h" 32 #include "ui/keyboard/keyboard_controller.h"
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 } 101 }
102 102
103 void AshKeyboardControllerProxy::RequestAudioInput( 103 void AshKeyboardControllerProxy::RequestAudioInput(
104 content::WebContents* web_contents, 104 content::WebContents* web_contents,
105 const content::MediaStreamRequest& request, 105 const content::MediaStreamRequest& request,
106 const content::MediaResponseCallback& callback) { 106 const content::MediaResponseCallback& callback) {
107 const extensions::Extension* extension = NULL; 107 const extensions::Extension* extension = NULL;
108 GURL origin(request.security_origin); 108 GURL origin(request.security_origin);
109 if (origin.SchemeIs(extensions::kExtensionScheme)) { 109 if (origin.SchemeIs(extensions::kExtensionScheme)) {
110 ExtensionService* extensions_service = 110 ExtensionService* extensions_service =
111 extensions::ExtensionSystem::GetForBrowserContext( 111 extensions::ExtensionSystem::Get(
112 GetBrowserContext())->extension_service(); 112 GetBrowserContext())->extension_service();
113 extension = extensions_service->extensions()->GetByID(origin.host()); 113 extension = extensions_service->extensions()->GetByID(origin.host());
114 DCHECK(extension); 114 DCHECK(extension);
115 } 115 }
116 116
117 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest( 117 MediaCaptureDevicesDispatcher::GetInstance()->ProcessMediaAccessRequest(
118 web_contents, request, callback, extension); 118 web_contents, request, callback, extension);
119 } 119 }
120 120
121 void AshKeyboardControllerProxy::SetupWebContents( 121 void AshKeyboardControllerProxy::SetupWebContents(
(...skipping 107 matching lines...) Expand 10 before | Expand all | Expand 10 after
229 return; 229 return;
230 animation_window_->layer()->GetAnimator()->RemoveObserver(this); 230 animation_window_->layer()->GetAnimator()->RemoveObserver(this);
231 animation_window_ = NULL; 231 animation_window_ = NULL;
232 }; 232 };
233 233
234 void AshKeyboardControllerProxy::SetUpdateInputType(ui::TextInputType type) { 234 void AshKeyboardControllerProxy::SetUpdateInputType(ui::TextInputType type) {
235 // TODO(bshe): Need to check the affected window's profile once multi-profile 235 // TODO(bshe): Need to check the affected window's profile once multi-profile
236 // is supported. 236 // is supported.
237 content::BrowserContext* context = GetBrowserContext(); 237 content::BrowserContext* context = GetBrowserContext();
238 extensions::EventRouter* router = 238 extensions::EventRouter* router =
239 extensions::ExtensionSystem::GetForBrowserContext(context)-> 239 extensions::ExtensionSystem::Get(context)->event_router();
240 event_router();
241 240
242 if (!router->HasEventListener( 241 if (!router->HasEventListener(
243 virtual_keyboard_private::OnTextInputBoxFocused::kEventName)) { 242 virtual_keyboard_private::OnTextInputBoxFocused::kEventName)) {
244 return; 243 return;
245 } 244 }
246 245
247 scoped_ptr<base::ListValue> event_args(new base::ListValue()); 246 scoped_ptr<base::ListValue> event_args(new base::ListValue());
248 scoped_ptr<base::DictionaryValue> input_context(new base::DictionaryValue()); 247 scoped_ptr<base::DictionaryValue> input_context(new base::DictionaryValue());
249 input_context->SetString("type", 248 input_context->SetString("type",
250 Context::ToString(TextInputTypeToGeneratedInputTypeEnum(type))); 249 Context::ToString(TextInputTypeToGeneratedInputTypeEnum(type)));
251 event_args->Append(input_context.release()); 250 event_args->Append(input_context.release());
252 251
253 scoped_ptr<extensions::Event> event(new extensions::Event( 252 scoped_ptr<extensions::Event> event(new extensions::Event(
254 virtual_keyboard_private::OnTextInputBoxFocused::kEventName, 253 virtual_keyboard_private::OnTextInputBoxFocused::kEventName,
255 event_args.Pass())); 254 event_args.Pass()));
256 event->restrict_to_browser_context = context; 255 event->restrict_to_browser_context = context;
257 router->DispatchEventToExtension(kVirtualKeyboardExtensionID, event.Pass()); 256 router->DispatchEventToExtension(kVirtualKeyboardExtensionID, event.Pass());
258 } 257 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/ash/app_sync_ui_state.cc ('k') | chrome/browser/ui/ash/chrome_new_window_delegate_chromeos.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698