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

Side by Side Diff: chrome/browser/task_manager/extension_information.cc

Issue 1102173002: Move GuestView layer in browser to components (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Test change to build 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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/task_manager/extension_information.h" 5 #include "chrome/browser/task_manager/extension_information.h"
6 6
7 #include "base/strings/string16.h" 7 #include "base/strings/string16.h"
8 #include "base/strings/utf_string_conversions.h" 8 #include "base/strings/utf_string_conversions.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
11 #include "chrome/browser/profiles/profile_manager.h" 11 #include "chrome/browser/profiles/profile_manager.h"
12 #include "chrome/browser/task_manager/renderer_resource.h" 12 #include "chrome/browser/task_manager/renderer_resource.h"
13 #include "chrome/browser/task_manager/task_manager_util.h" 13 #include "chrome/browser/task_manager/task_manager_util.h"
14 #include "components/guest_view/browser/guest_view_base.h"
14 #include "content/public/browser/render_frame_host.h" 15 #include "content/public/browser/render_frame_host.h"
15 #include "content/public/browser/render_process_host.h" 16 #include "content/public/browser/render_process_host.h"
16 #include "content/public/browser/render_view_host.h" 17 #include "content/public/browser/render_view_host.h"
17 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
18 #include "extensions/browser/guest_view/guest_view_base.h"
19 #include "extensions/browser/process_manager.h" 19 #include "extensions/browser/process_manager.h"
20 #include "extensions/browser/view_type_utils.h" 20 #include "extensions/browser/view_type_utils.h"
21 #include "extensions/common/extension.h" 21 #include "extensions/common/extension.h"
22 #include "grit/theme_resources.h" 22 #include "grit/theme_resources.h"
23 #include "ui/base/l10n/l10n_util.h" 23 #include "ui/base/l10n/l10n_util.h"
24 #include "ui/base/resource/resource_bundle.h" 24 #include "ui/base/resource/resource_bundle.h"
25 #include "ui/gfx/image/image_skia.h" 25 #include "ui/gfx/image/image_skia.h"
26 26
27 using content::WebContents; 27 using content::WebContents;
28 using extensions::Extension; 28 using extensions::Extension;
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 WebContents* web_contents = WebContents::FromRenderFrameHost(host); 130 WebContents* web_contents = WebContents::FromRenderFrameHost(host);
131 if (CheckOwnership(web_contents)) 131 if (CheckOwnership(web_contents))
132 callback.Run(web_contents); 132 callback.Run(web_contents);
133 } 133 }
134 } 134 }
135 } 135 }
136 136
137 bool ExtensionInformation::CheckOwnership(WebContents* web_contents) { 137 bool ExtensionInformation::CheckOwnership(WebContents* web_contents) {
138 // Don't add WebContents that belong to a guest (those are handled by 138 // Don't add WebContents that belong to a guest (those are handled by
139 // GuestInformation). Otherwise they will be added twice. 139 // GuestInformation). Otherwise they will be added twice.
140 if (extensions::GuestViewBase::IsGuest(web_contents)) 140 if (guestview::GuestViewBase::IsGuest(web_contents))
141 return false; 141 return false;
142 142
143 // Extension WebContents tracked by this class will always host extension 143 // Extension WebContents tracked by this class will always host extension
144 // content. 144 // content.
145 if (!GetExtensionForWebContents(web_contents)) 145 if (!GetExtensionForWebContents(web_contents))
146 return false; 146 return false;
147 147
148 extensions::ViewType view_type = extensions::GetViewType(web_contents); 148 extensions::ViewType view_type = extensions::GetViewType(web_contents);
149 149
150 // Don't add tab contents (those are handled by TabContentsResourceProvider) 150 // Don't add tab contents (those are handled by TabContentsResourceProvider)
(...skipping 10 matching lines...) Expand all
161 const Extension* extension = GetExtensionForWebContents(web_contents); 161 const Extension* extension = GetExtensionForWebContents(web_contents);
162 if (!extension) { 162 if (!extension) {
163 NOTREACHED(); 163 NOTREACHED();
164 return scoped_ptr<RendererResource>(); 164 return scoped_ptr<RendererResource>();
165 } 165 }
166 return scoped_ptr<RendererResource>(new ExtensionProcessResource( 166 return scoped_ptr<RendererResource>(new ExtensionProcessResource(
167 extension, web_contents->GetRenderViewHost())); 167 extension, web_contents->GetRenderViewHost()));
168 } 168 }
169 169
170 } // namespace task_manager 170 } // namespace task_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698