Chromium Code Reviews| Index: extensions/browser/guest_view/guest_view_base.cc |
| diff --git a/extensions/browser/guest_view/guest_view_base.cc b/extensions/browser/guest_view/guest_view_base.cc |
| index 60e1b3cfd14ba585cb77b1f955ece1f4e014332a..94ed962d2b3163c173383827f89305372252203d 100644 |
| --- a/extensions/browser/guest_view/guest_view_base.cc |
| +++ b/extensions/browser/guest_view/guest_view_base.cc |
| @@ -108,23 +108,22 @@ void GuestViewBase::Init(const std::string& embedder_extension_id, |
| return; |
| initialized_ = true; |
| - extensions::Feature* feature = |
| - extensions::FeatureProvider::GetAPIFeatures()->GetFeature( |
| + Feature* feature = |
| + FeatureProvider::GetAPIFeatures()->GetFeature( |
|
Fady Samuel
2014/08/12 21:25:30
Move to previous line?
Xi Han
2014/08/12 21:53:48
Done.
|
| GetAPINamespace()); |
| CHECK(feature); |
| - extensions::ProcessMap* process_map = |
| - extensions::ProcessMap::Get(browser_context()); |
| + ProcessMap* process_map = ProcessMap::Get(browser_context()); |
| CHECK(process_map); |
| - const extensions::Extension* embedder_extension = |
| - extensions::ExtensionRegistry::Get(browser_context_) |
| + const Extension* embedder_extension = |
| + ExtensionRegistry::Get(browser_context_) |
|
Fady Samuel
2014/08/12 21:25:30
Move to previous line?
Xi Han
2014/08/12 21:53:49
Done.
|
| ->enabled_extensions() |
| .GetByID(embedder_extension_id); |
| int embedder_process_id = |
| embedder_web_contents->GetRenderProcessHost()->GetID(); |
| - extensions::Feature::Availability availability = |
| + Feature::Availability availability = |
| feature->IsAvailableToContext( |
| embedder_extension, |
| process_map->GetMostLikelyContextType(embedder_extension, |
| @@ -404,18 +403,18 @@ void GuestViewBase::DispatchEventToEmbedder(Event* event) { |
| return; |
| } |
| - extensions::EventFilteringInfo info; |
| + EventFilteringInfo info; |
| info.SetInstanceID(view_instance_id_); |
| scoped_ptr<base::ListValue> args(new base::ListValue()); |
| args->Append(event->GetArguments().release()); |
| - extensions::EventRouter::DispatchEvent( |
| + EventRouter::DispatchEvent( |
| embedder_web_contents_, |
| browser_context_, |
| embedder_extension_id_, |
| event->name(), |
| args.Pass(), |
| - extensions::EventRouter::USER_GESTURE_UNKNOWN, |
| + EventRouter::USER_GESTURE_UNKNOWN, |
| info); |
| } |
| @@ -448,7 +447,7 @@ void GuestViewBase::CompleteInit(const std::string& embedder_extension_id, |
| // static |
| void GuestViewBase::RegisterGuestViewTypes() { |
| - extensions::ExtensionsAPIClient::Get()->RegisterGuestViewTypes(); |
| + ExtensionsAPIClient::Get()->RegisterGuestViewTypes(); |
| } |
| } // namespace extensions |