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

Side by Side Diff: chrome/browser/extensions/api/tabs/ash_panel_contents.cc

Issue 1685003002: Plumb the correct owner document through DocumentInit::m_owner. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 4 years, 9 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/extensions/api/tabs/ash_panel_contents.h" 5 #include "chrome/browser/extensions/api/tabs/ash_panel_contents.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" 9 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"
10 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h" 10 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"
11 #include "chrome/browser/extensions/api/tabs/windows_event_router.h" 11 #include "chrome/browser/extensions/api/tabs/windows_event_router.h"
12 #include "chrome/browser/extensions/extension_tab_util.h" 12 #include "chrome/browser/extensions/extension_tab_util.h"
13 #include "chrome/browser/extensions/window_controller_list.h" 13 #include "chrome/browser/extensions/window_controller_list.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/sessions/session_tab_helper.h" 15 #include "chrome/browser/sessions/session_tab_helper.h"
16 #include "content/public/browser/browser_context.h" 16 #include "content/public/browser/browser_context.h"
17 #include "content/public/browser/render_frame_host.h"
18 #include "content/public/browser/render_process_host.h"
17 #include "content/public/browser/site_instance.h" 19 #include "content/public/browser/site_instance.h"
18 #include "content/public/browser/web_contents.h" 20 #include "content/public/browser/web_contents.h"
19 #include "extensions/browser/app_window/native_app_window.h" 21 #include "extensions/browser/app_window/native_app_window.h"
20 #include "extensions/common/extension.h" 22 #include "extensions/common/extension.h"
21 #include "extensions/common/permissions/api_permission.h" 23 #include "extensions/common/permissions/api_permission.h"
22 #include "extensions/common/permissions/permissions_data.h" 24 #include "extensions/common/permissions/permissions_data.h"
23 #include "ui/gfx/image/image.h" 25 #include "ui/gfx/image/image.h"
24 26
25 using extensions::AppWindow; 27 using extensions::AppWindow;
26 using extensions::NativeAppWindow; 28 using extensions::NativeAppWindow;
27 29
28 // AshPanelContents ----------------------------------------------------- 30 // AshPanelContents -----------------------------------------------------
29 31
30 AshPanelContents::AshPanelContents(AppWindow* host) : host_(host) {} 32 AshPanelContents::AshPanelContents(AppWindow* host) : host_(host) {}
31 33
32 AshPanelContents::~AshPanelContents() { 34 AshPanelContents::~AshPanelContents() {
33 } 35 }
34 36
35 void AshPanelContents::Initialize(content::BrowserContext* context, 37 void AshPanelContents::Initialize(content::BrowserContext* context,
38 content::RenderFrameHost* creator_frame,
36 const GURL& url) { 39 const GURL& url) {
37 url_ = url; 40 url_ = url;
38 41
39 web_contents_.reset( 42 content::WebContents::CreateParams create_params(
40 content::WebContents::Create(content::WebContents::CreateParams( 43 context, creator_frame->GetSiteInstance());
41 context, content::SiteInstance::CreateForURL(context, url_)))); 44 create_params.opener_render_process_id = creator_frame->GetProcess()->GetID();
45 create_params.opener_render_frame_id = creator_frame->GetRoutingID();
46 web_contents_.reset(content::WebContents::Create(create_params));
42 47
43 // Needed to give the web contents a Window ID. Extension APIs expect web 48 // Needed to give the web contents a Window ID. Extension APIs expect web
44 // contents to have a Window ID. Also required for FaviconDriver to correctly 49 // contents to have a Window ID. Also required for FaviconDriver to correctly
45 // set the window icon and title. 50 // set the window icon and title.
46 SessionTabHelper::CreateForWebContents(web_contents_.get()); 51 SessionTabHelper::CreateForWebContents(web_contents_.get());
47 SessionTabHelper::FromWebContents(web_contents_.get())->SetWindowID( 52 SessionTabHelper::FromWebContents(web_contents_.get())->SetWindowID(
48 host_->session_id()); 53 host_->session_id());
49 54
50 // Responsible for loading favicons for the Launcher, which uses different 55 // Responsible for loading favicons for the Launcher, which uses different
51 // logic than the FaviconDriver associated with web_contents_ (instantiated in 56 // logic than the FaviconDriver associated with web_contents_ (instantiated in
(...skipping 25 matching lines...) Expand all
77 82
78 extensions::WindowController* AshPanelContents::GetWindowController() const { 83 extensions::WindowController* AshPanelContents::GetWindowController() const {
79 return nullptr; 84 return nullptr;
80 } 85 }
81 86
82 void AshPanelContents::FaviconUpdated() { 87 void AshPanelContents::FaviconUpdated() {
83 gfx::Image new_image = gfx::Image::CreateFrom1xBitmap( 88 gfx::Image new_image = gfx::Image::CreateFrom1xBitmap(
84 launcher_favicon_loader_->GetFavicon()); 89 launcher_favicon_loader_->GetFavicon());
85 host_->UpdateAppIcon(new_image); 90 host_->UpdateAppIcon(new_image);
86 } 91 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698