chrome/browser/ui/extensions/shell_window.h - Issue 11198044: Make tab capture media stream requests verify that the request came from extension API

Side by Side Diff: chrome/browser/ui/extensions/shell_window.h

Issue 11198044: Make tab capture media stream requests verify that the request came from extension API (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Rebase and move flag check into extension_host Created 8 years, 2 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

« chrome/browser/media/media_stream_devices_controller.cc ('K') | « chrome/browser/media/media_stream_devices_controller.cc ('k') | chrome/browser/ui/extensions/shell_window.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 (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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 #ifndef CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_	5 #ifndef CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_

6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_	6 #define CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_

7	7

8 #include "base/memory/scoped_ptr.h"	8 #include "base/memory/scoped_ptr.h"

9 #include "chrome/browser/extensions/extension_function_dispatcher.h"	9 #include "chrome/browser/extensions/extension_function_dispatcher.h"

10 #include "chrome/browser/extensions/extension_keybinding_registry.h"	10 #include "chrome/browser/extensions/extension_keybinding_registry.h"

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

12 #include "chrome/browser/sessions/session_id.h"	12 #include "chrome/browser/sessions/session_id.h"

13 #include "chrome/browser/ui/base_window.h"	13 #include "chrome/browser/ui/base_window.h"

	14 #include "chrome/common/extensions/request_media_access_permission_helper.h"
	Aaron Boodman 2012/10/24 01:29:38 Include doesn't seem necessary in this file. Include doesn't seem necessary in this file. justinlin 2012/10/24 02:04:54 Done. Moved to cc. Show quoted text On 2012/10/24 01:29:38, Aaron Boodman wrote: > Include doesn't seem necessary in this file. Done. Moved to cc.
14 #include "content/public/browser/notification_observer.h"	15 #include "content/public/browser/notification_observer.h"

15 #include "content/public/browser/notification_registrar.h"	16 #include "content/public/browser/notification_registrar.h"

16 #include "content/public/browser/web_contents_delegate.h"	17 #include "content/public/browser/web_contents_delegate.h"

17 #include "content/public/browser/web_contents_observer.h"	18 #include "content/public/browser/web_contents_observer.h"

18 #include "content/public/common/console_message_level.h"	19 #include "content/public/common/console_message_level.h"

19 #include "ui/gfx/image/image.h"	20 #include "ui/gfx/image/image.h"

20 #include "ui/gfx/rect.h"	21 #include "ui/gfx/rect.h"

21	22

22 class GURL;	23 class GURL;

23 class Profile;	24 class Profile;

(...skipping 184 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
208	209

209 // Used for loading app_icon_.	210 // Used for loading app_icon_.

210 scoped_ptr<ImageLoadingTracker> app_icon_loader_;	211 scoped_ptr<ImageLoadingTracker> app_icon_loader_;

211	212

212 scoped_ptr<NativeShellWindow> native_window_;	213 scoped_ptr<NativeShellWindow> native_window_;

213	214

214 DISALLOW_COPY_AND_ASSIGN(ShellWindow);	215 DISALLOW_COPY_AND_ASSIGN(ShellWindow);

215 };	216 };

216	217

217 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_	218 #endif // CHROME_BROWSER_UI_EXTENSIONS_SHELL_WINDOW_H_

OLD	NEW