apps/app_window_contents.cc - Issue 21344002: Move native_app_window code to apps areas

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: apps/app_window_contents.cc

Issue 21344002: Move native_app_window code to apps areas (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase to after mac app shim fix Created 7 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 | Annotate | Revision Log

« no previous file with comments | « apps/app_shim/extension_app_shim_handler_mac.cc ('k') | apps/apps.gypi » ('j') | no next file with comments »

OLD	NEW
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 "apps/app_window_contents.h"	5 #include "apps/app_window_contents.h"

6	6

	7 #include "apps/native_app_window.h"

7 #include "chrome/browser/chrome_notification_types.h"	8 #include "chrome/browser/chrome_notification_types.h"

8 #include "chrome/browser/profiles/profile.h"	9 #include "chrome/browser/profiles/profile.h"

9 #include "chrome/browser/ui/extensions/native_app_window.h"

10 #include "chrome/common/extensions/api/app_window.h"	10 #include "chrome/common/extensions/api/app_window.h"

11 #include "chrome/common/extensions/extension_messages.h"	11 #include "chrome/common/extensions/extension_messages.h"

12 #include "content/public/browser/browser_thread.h"	12 #include "content/public/browser/browser_thread.h"

13 #include "content/public/browser/render_process_host.h"	13 #include "content/public/browser/render_process_host.h"

14 #include "content/public/browser/render_view_host.h"	14 #include "content/public/browser/render_view_host.h"

15 #include "content/public/browser/resource_dispatcher_host.h"	15 #include "content/public/browser/resource_dispatcher_host.h"

16 #include "content/public/browser/site_instance.h"	16 #include "content/public/browser/site_instance.h"

17 #include "content/public/browser/web_contents.h"	17 #include "content/public/browser/web_contents.h"

18 #include "content/public/common/renderer_preferences.h"	18 #include "content/public/common/renderer_preferences.h"

19	19

(...skipping 148 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
168 content::RenderViewHost* rvh) {	168 content::RenderViewHost* rvh) {

169 DCHECK(rvh);	169 DCHECK(rvh);

170 content::BrowserThread::PostTask(	170 content::BrowserThread::PostTask(

171 content::BrowserThread::IO, FROM_HERE,	171 content::BrowserThread::IO, FROM_HERE,

172 base::Bind(&content::ResourceDispatcherHost::BlockRequestsForRoute,	172 base::Bind(&content::ResourceDispatcherHost::BlockRequestsForRoute,

173 base::Unretained(content::ResourceDispatcherHost::Get()),	173 base::Unretained(content::ResourceDispatcherHost::Get()),

174 rvh->GetProcess()->GetID(), rvh->GetRoutingID()));	174 rvh->GetProcess()->GetID(), rvh->GetRoutingID()));

175 }	175 }

176	176

177 } // namespace apps	177 } // namespace apps

OLD	NEW