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

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

Issue 464533002: Move guest_view to extensions. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Small changes are made in guest_view_manager_unittest.cc Created 6 years, 4 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/guest_view/guest_view_base.h"
11 #include "chrome/browser/profiles/profile.h" 10 #include "chrome/browser/profiles/profile.h"
12 #include "chrome/browser/profiles/profile_manager.h" 11 #include "chrome/browser/profiles/profile_manager.h"
13 #include "chrome/browser/task_manager/renderer_resource.h" 12 #include "chrome/browser/task_manager/renderer_resource.h"
14 #include "chrome/browser/task_manager/task_manager_util.h" 13 #include "chrome/browser/task_manager/task_manager_util.h"
15 #include "content/public/browser/render_frame_host.h" 14 #include "content/public/browser/render_frame_host.h"
16 #include "content/public/browser/render_process_host.h" 15 #include "content/public/browser/render_process_host.h"
17 #include "content/public/browser/render_view_host.h" 16 #include "content/public/browser/render_view_host.h"
18 #include "content/public/browser/web_contents.h" 17 #include "content/public/browser/web_contents.h"
19 #include "extensions/browser/extension_system.h" 18 #include "extensions/browser/extension_system.h"
19 #include "extensions/browser/guest_view/guest_view_base.h"
20 #include "extensions/browser/process_manager.h" 20 #include "extensions/browser/process_manager.h"
21 #include "extensions/browser/view_type_utils.h" 21 #include "extensions/browser/view_type_utils.h"
22 #include "extensions/common/extension.h" 22 #include "extensions/common/extension.h"
23 #include "grit/theme_resources.h" 23 #include "grit/theme_resources.h"
24 #include "ui/base/l10n/l10n_util.h" 24 #include "ui/base/l10n/l10n_util.h"
25 #include "ui/base/resource/resource_bundle.h" 25 #include "ui/base/resource/resource_bundle.h"
26 #include "ui/gfx/image/image_skia.h" 26 #include "ui/gfx/image/image_skia.h"
27 27
28 using content::WebContents; 28 using content::WebContents;
29 using extensions::Extension; 29 using extensions::Extension;
(...skipping 111 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 if (CheckOwnership(web_contents)) 141 if (CheckOwnership(web_contents))
142 callback.Run(web_contents); 142 callback.Run(web_contents);
143 } 143 }
144 } 144 }
145 } 145 }
146 } 146 }
147 147
148 bool ExtensionInformation::CheckOwnership(WebContents* web_contents) { 148 bool ExtensionInformation::CheckOwnership(WebContents* web_contents) {
149 // Don't add WebContents that belong to a guest (those are handled by 149 // Don't add WebContents that belong to a guest (those are handled by
150 // GuestInformation). Otherwise they will be added twice. 150 // GuestInformation). Otherwise they will be added twice.
151 if (GuestViewBase::IsGuest(web_contents)) 151 if (extensions::GuestViewBase::IsGuest(web_contents))
152 return false; 152 return false;
153 153
154 // Extension WebContents tracked by this class will always host extension 154 // Extension WebContents tracked by this class will always host extension
155 // content. 155 // content.
156 if (!GetExtensionForWebContents(web_contents)) 156 if (!GetExtensionForWebContents(web_contents))
157 return false; 157 return false;
158 158
159 extensions::ViewType view_type = extensions::GetViewType(web_contents); 159 extensions::ViewType view_type = extensions::GetViewType(web_contents);
160 160
161 // Don't add tab contents (those are handled by TabContentsResourceProvider) 161 // Don't add tab contents (those are handled by TabContentsResourceProvider)
(...skipping 10 matching lines...) Expand all
172 const Extension* extension = GetExtensionForWebContents(web_contents); 172 const Extension* extension = GetExtensionForWebContents(web_contents);
173 if (!extension) { 173 if (!extension) {
174 NOTREACHED(); 174 NOTREACHED();
175 return scoped_ptr<RendererResource>(); 175 return scoped_ptr<RendererResource>();
176 } 176 }
177 return scoped_ptr<RendererResource>(new ExtensionProcessResource( 177 return scoped_ptr<RendererResource>(new ExtensionProcessResource(
178 extension, web_contents->GetRenderViewHost())); 178 extension, web_contents->GetRenderViewHost()));
179 } 179 }
180 180
181 } // namespace task_manager 181 } // namespace task_manager
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698