chrome/browser/extensions/api/tabs/ash_panel_contents.cc - Issue 12298037: Revert 183123

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: chrome/browser/extensions/api/tabs/ash_panel_contents.cc

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/

Patch Set: Created 7 years, 10 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 | « chrome/browser/extensions/api/system_indicator/system_indicator_manager.h ('k') | chrome/browser/extensions/app_window_contents.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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 "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/extensions/api/tabs/tabs_constants.h"	8 #include "chrome/browser/extensions/api/tabs/tabs_constants.h"

9 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"	9 #include "chrome/browser/extensions/api/tabs/tabs_windows_api.h"

10 #include "chrome/browser/extensions/api/tabs/windows_event_router.h"	10 #include "chrome/browser/extensions/api/tabs/windows_event_router.h"

11 #include "chrome/browser/extensions/extension_tab_util.h"	11 #include "chrome/browser/extensions/extension_tab_util.h"

12 #include "chrome/browser/extensions/window_controller_list.h"	12 #include "chrome/browser/extensions/window_controller_list.h"

13 #include "chrome/browser/profiles/profile.h"

14 #include "chrome/browser/ui/extensions/native_app_window.h"	13 #include "chrome/browser/ui/extensions/native_app_window.h"

15 #include "chrome/browser/ui/extensions/shell_window.h"	14 #include "chrome/browser/ui/extensions/shell_window.h"

16 #include "chrome/common/chrome_notification_types.h"	15 #include "chrome/common/chrome_notification_types.h"

17 #include "chrome/common/extensions/extension.h"	16 #include "chrome/common/extensions/extension.h"

18 #include "chrome/common/extensions/extension_messages.h"	17 #include "chrome/common/extensions/extension_messages.h"

19 #include "content/public/browser/site_instance.h"	18 #include "content/public/browser/site_instance.h"

20 #include "content/public/browser/web_contents.h"	19 #include "content/public/browser/web_contents.h"

21	20

22 // AshPanelWindowController ----------------------------------------------------	21 // AshPanelWindowController ----------------------------------------------------

23	22

(...skipping 189 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
213	212

214 content::WebContents* AshPanelContents::GetAssociatedWebContents() const {	213 content::WebContents* AshPanelContents::GetAssociatedWebContents() const {

215 return web_contents_.get();	214 return web_contents_.get();

216 }	215 }

217	216

218 void AshPanelContents::OnRequest(	217 void AshPanelContents::OnRequest(

219 const ExtensionHostMsg_Request_Params& params) {	218 const ExtensionHostMsg_Request_Params& params) {

220 extension_function_dispatcher_->Dispatch(	219 extension_function_dispatcher_->Dispatch(

221 params, web_contents_->GetRenderViewHost());	220 params, web_contents_->GetRenderViewHost());

222 }	221 }

OLD	NEW