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

Side by Side Diff: content/browser/web_contents/web_contents_impl.cc

Issue 2865653002: [Device Service] Decouple NFC implementation from //content (Closed)
Patch Set: Response to review + fix for tests that don't actually run on bots Created 3 years, 7 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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 "content/browser/web_contents/web_contents_impl.h" 5 #include "content/browser/web_contents/web_contents_impl.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 8
9 #include <cmath> 9 #include <cmath>
10 #include <utility> 10 #include <utility>
(...skipping 2624 matching lines...) Expand 10 before | Expand all | Expand 10 after
2635 if (!renderer_wake_lock_) { 2635 if (!renderer_wake_lock_) {
2636 device::mojom::WakeLockContext* wake_lock_context = GetWakeLockContext(); 2636 device::mojom::WakeLockContext* wake_lock_context = GetWakeLockContext();
2637 if (!wake_lock_context) { 2637 if (!wake_lock_context) {
2638 return nullptr; 2638 return nullptr;
2639 } 2639 }
2640 wake_lock_context->GetWakeLock(mojo::MakeRequest(&renderer_wake_lock_)); 2640 wake_lock_context->GetWakeLock(mojo::MakeRequest(&renderer_wake_lock_));
2641 } 2641 }
2642 return renderer_wake_lock_.get(); 2642 return renderer_wake_lock_.get();
2643 } 2643 }
2644 2644
2645 void WebContentsImpl::GetNFC(device::nfc::mojom::NFCRequest request) {
2646 if (!nfc_host_)
2647 nfc_host_.reset(new NFCHost(this));
2648 nfc_host_->GetNFC(std::move(request));
2649 }
2650
2645 void WebContentsImpl::OnShowValidationMessage( 2651 void WebContentsImpl::OnShowValidationMessage(
2646 RenderViewHostImpl* source, 2652 RenderViewHostImpl* source,
2647 const gfx::Rect& anchor_in_root_view, 2653 const gfx::Rect& anchor_in_root_view,
2648 const base::string16& main_text, 2654 const base::string16& main_text,
2649 const base::string16& sub_text) { 2655 const base::string16& sub_text) {
2650 // TODO(nick): Should we consider |source| here or pass it to the delegate? 2656 // TODO(nick): Should we consider |source| here or pass it to the delegate?
2651 if (delegate_) 2657 if (delegate_)
2652 delegate_->ShowValidationMessage( 2658 delegate_->ShowValidationMessage(
2653 this, anchor_in_root_view, main_text, sub_text); 2659 this, anchor_in_root_view, main_text, sub_text);
2654 } 2660 }
(...skipping 1670 matching lines...) Expand 10 before | Expand all | Expand 10 after
4325 4331
4326 if (!render_frame_host->IsRenderFrameLive() || render_frame_host->GetParent()) 4332 if (!render_frame_host->IsRenderFrameLive() || render_frame_host->GetParent())
4327 return; 4333 return;
4328 4334
4329 NavigationEntry* entry = controller_.GetPendingEntry(); 4335 NavigationEntry* entry = controller_.GetPendingEntry();
4330 if (entry && entry->IsViewSourceMode()) { 4336 if (entry && entry->IsViewSourceMode()) {
4331 // Put the renderer in view source mode. 4337 // Put the renderer in view source mode.
4332 render_frame_host->Send( 4338 render_frame_host->Send(
4333 new FrameMsg_EnableViewSourceMode(render_frame_host->GetRoutingID())); 4339 new FrameMsg_EnableViewSourceMode(render_frame_host->GetRoutingID()));
4334 } 4340 }
4335 #if defined(OS_ANDROID)
4336 render_frame_host->GetInterfaceRegistry()->AddInterface(
4337 GetJavaInterfaces()->CreateInterfaceFactory<device::nfc::mojom::NFC>());
4338 #endif
4339 } 4341 }
4340 4342
4341 void WebContentsImpl::RenderFrameDeleted(RenderFrameHost* render_frame_host) { 4343 void WebContentsImpl::RenderFrameDeleted(RenderFrameHost* render_frame_host) {
4342 for (auto& observer : observers_) 4344 for (auto& observer : observers_)
4343 observer.RenderFrameDeleted(render_frame_host); 4345 observer.RenderFrameDeleted(render_frame_host);
4344 #if BUILDFLAG(ENABLE_PLUGINS) 4346 #if BUILDFLAG(ENABLE_PLUGINS)
4345 pepper_playback_observer_->RenderFrameDeleted(render_frame_host); 4347 pepper_playback_observer_->RenderFrameDeleted(render_frame_host);
4346 #endif 4348 #endif
4347 } 4349 }
4348 4350
(...skipping 1267 matching lines...) Expand 10 before | Expand all | Expand 10 after
5616 RenderViewHost* render_view_host = RenderViewHost::From(render_widget_host); 5618 RenderViewHost* render_view_host = RenderViewHost::From(render_widget_host);
5617 if (!render_view_host) 5619 if (!render_view_host)
5618 continue; 5620 continue;
5619 render_view_host_set.insert(render_view_host); 5621 render_view_host_set.insert(render_view_host);
5620 } 5622 }
5621 for (RenderViewHost* render_view_host : render_view_host_set) 5623 for (RenderViewHost* render_view_host : render_view_host_set)
5622 render_view_host->OnWebkitPreferencesChanged(); 5624 render_view_host->OnWebkitPreferencesChanged();
5623 } 5625 }
5624 5626
5625 } // namespace content 5627 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698