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

Side by Side Diff: chrome/browser/devtools/devtools_target_impl.cc

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed unnecessary dependency Created 5 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 2013 The Chromium Authors. All rights reserved. 1 // Copyright 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/devtools/devtools_target_impl.h" 5 #include "chrome/browser/devtools/devtools_target_impl.h"
6 6
7 #include "base/strings/stringprintf.h" 7 #include "base/strings/stringprintf.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/devtools/devtools_window.h" 9 #include "chrome/browser/devtools/devtools_window.h"
10 #include "chrome/browser/extensions/extension_tab_util.h" 10 #include "chrome/browser/extensions/extension_tab_util.h"
11 #include "chrome/browser/profiles/profile.h" 11 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h" 12 #include "chrome/browser/ui/tab_contents/tab_contents_iterator.h"
13 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h" 13 #include "chrome/browser/ui/webui/extensions/extension_icon_source.h"
14 #include "chrome/common/extensions/extension_constants.h" 14 #include "chrome/common/extensions/extension_constants.h"
15 #include "components/guest_view/browser/guest_view_base.h"
15 #include "content/public/browser/browser_thread.h" 16 #include "content/public/browser/browser_thread.h"
16 #include "content/public/browser/devtools_agent_host.h" 17 #include "content/public/browser/devtools_agent_host.h"
17 #include "content/public/browser/favicon_status.h" 18 #include "content/public/browser/favicon_status.h"
18 #include "content/public/browser/navigation_entry.h" 19 #include "content/public/browser/navigation_entry.h"
19 #include "content/public/browser/render_frame_host.h" 20 #include "content/public/browser/render_frame_host.h"
20 #include "content/public/browser/web_contents.h" 21 #include "content/public/browser/web_contents.h"
21 #include "extensions/browser/extension_host.h" 22 #include "extensions/browser/extension_host.h"
22 #include "extensions/browser/extension_registry.h" 23 #include "extensions/browser/extension_registry.h"
23 #include "extensions/browser/guest_view/guest_view_base.h"
24 #include "extensions/browser/process_manager.h" 24 #include "extensions/browser/process_manager.h"
25 #include "extensions/common/constants.h" 25 #include "extensions/common/constants.h"
26 26
27 using content::BrowserThread; 27 using content::BrowserThread;
28 using content::DevToolsAgentHost; 28 using content::DevToolsAgentHost;
29 using content::WebContents; 29 using content::WebContents;
30 30
31 const char DevToolsTargetImpl::kTargetTypeApp[] = "app"; 31 const char DevToolsTargetImpl::kTargetTypeApp[] = "app";
32 const char DevToolsTargetImpl::kTargetTypeBackgroundPage[] = "background_page"; 32 const char DevToolsTargetImpl::kTargetTypeBackgroundPage[] = "background_page";
33 const char DevToolsTargetImpl::kTargetTypePage[] = "page"; 33 const char DevToolsTargetImpl::kTargetTypePage[] = "page";
(...skipping 19 matching lines...) Expand all
53 private: 53 private:
54 int tab_id_; 54 int tab_id_;
55 std::string extension_id_; 55 std::string extension_id_;
56 }; 56 };
57 57
58 WebContentsTarget::WebContentsTarget(WebContents* web_contents, bool is_tab) 58 WebContentsTarget::WebContentsTarget(WebContents* web_contents, bool is_tab)
59 : DevToolsTargetImpl(DevToolsAgentHost::GetOrCreateFor(web_contents)), 59 : DevToolsTargetImpl(DevToolsAgentHost::GetOrCreateFor(web_contents)),
60 tab_id_(-1) { 60 tab_id_(-1) {
61 set_type(kTargetTypeOther); 61 set_type(kTargetTypeOther);
62 62
63 extensions::GuestViewBase* guest = 63 guest_view::GuestViewBase* guest =
64 extensions::GuestViewBase::FromWebContents(web_contents); 64 guest_view::GuestViewBase::FromWebContents(web_contents);
65 WebContents* guest_contents = guest ? guest->embedder_web_contents() : NULL; 65 WebContents* guest_contents = guest ? guest->embedder_web_contents() : NULL;
66 if (guest_contents) { 66 if (guest_contents) {
67 set_type(kTargetTypeWebView); 67 set_type(kTargetTypeWebView);
68 set_parent_id(DevToolsAgentHost::GetOrCreateFor(guest_contents)->GetId()); 68 set_parent_id(DevToolsAgentHost::GetOrCreateFor(guest_contents)->GetId());
69 return; 69 return;
70 } 70 }
71 71
72 if (is_tab) { 72 if (is_tab) {
73 set_type(kTargetTypePage); 73 set_type(kTargetTypePage);
74 tab_id_ = extensions::ExtensionTabUtil::GetTabId(web_contents); 74 tab_id_ = extensions::ExtensionTabUtil::GetTabId(web_contents);
(...skipping 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
234 break; 234 break;
235 case DevToolsAgentHost::TYPE_SERVICE_WORKER: 235 case DevToolsAgentHost::TYPE_SERVICE_WORKER:
236 result.push_back(new WorkerTarget(agent_host)); 236 result.push_back(new WorkerTarget(agent_host));
237 break; 237 break;
238 default: 238 default:
239 break; 239 break;
240 } 240 }
241 } 241 }
242 return result; 242 return result;
243 } 243 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698