<webview>: Move NewWindow API to chrome

chrome/browser/devtools/devtools_targets_ui.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "chrome/browser/devtools/devtools_targets_ui.h"
 
 #include "base/memory/weak_ptr.h"
 #include "base/stl_util.h"
 #include "base/strings/stringprintf.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/devtools/device/devtools_android_bridge.h"
 #include "chrome/browser/devtools/devtools_target_impl.h"
+#include "chrome/browser/guest_view/guest_view_base.h"
 #include "chrome/common/chrome_version_info.h"
 #include "content/public/browser/browser_child_process_observer.h"
 #include "content/public/browser/browser_thread.h"
 #include "content/public/browser/child_process_data.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_frame_host.h"
@@ skipping 46 matching lines @@
 
 class CancelableTimer {
  public:
   CancelableTimer(base::Closure callback, base::TimeDelta delay)
       : callback_(callback),
         weak_factory_(this) {
     base::MessageLoop::current()->PostDelayedTask(
         FROM_HERE,
         base::Bind(&CancelableTimer::Fire, weak_factory_.GetWeakPtr()),
         delay);
-  };
+  }
 
  private:
   void Fire() { callback_.Run(); }
 
   base::Closure callback_;
   base::WeakPtrFactory<CancelableTimer> weak_factory_;
 };
 
 // RenderViewHostTargetsUIHandler ---------------------------------------------
 
@@ skipping 77 matching lines @@
       list_value->Append(descriptor);
     }
   }
 
   // Add the list of nested targets to each of its owners.
   for (std::vector<RenderFrameHost*>::iterator it(nested_frames.begin());
        it != nested_frames.end(); ++it) {
     RenderFrameHost* rfh = (*it);
     RenderFrameHost* parent_rfh = NULL;
     content::RenderViewHost* rvh = rfh->GetRenderViewHost();
-    if (rvh->GetProcess()->IsGuest()) {
-      WebContents* nested_web_contents = WebContents::FromRenderViewHost(rvh);
-      WebContents* embedder = nested_web_contents->GetEmbedderWebContents();
+    WebContents* nested_web_contents = WebContents::FromRenderViewHost(rvh);
+    GuestViewBase* guest = GuestViewBase::FromWebContents(nested_web_contents);
+    if (guest) {
+      WebContents* embedder = guest->embedder_web_contents();
       parent_rfh = embedder->GetRenderViewHost()->GetMainFrame();
     } else {
       parent_rfh = rfh->GetParent();
       DCHECK(parent_rfh);
     }
     if (parent_rfh && rfh_to_descriptor.count(parent_rfh) > 0) {
       base::DictionaryValue* parent = rfh_to_descriptor[parent_rfh];
       base::ListValue* guests = NULL;
       if (!parent->GetList(kGuestList, &guests)) {
         guests = new base::ListValue();
@@ skipping 391 matching lines @@
           base::StringPrintf("%d", it->first), it->second);
     }
 
     std::string device_id = base::StringPrintf(
         kAdbDeviceIdFormat,
         sit->first.c_str());
     result.Set(device_id, device_status_dict);
   }
   callback_.Run(result);
 }