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

Side by Side Diff: chrome/browser/chrome_content_browser_client.h

Issue 9845033: Move the MediaObserver getter from ResourceContext to ContentBrowserClient, since we only need to s… (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: fix dcheck Created 8 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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_CHROME_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 6 #define CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
7 #pragma once 7 #pragma once
8 8
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after
114 net::SSLCertRequestInfo* cert_request_info, 114 net::SSLCertRequestInfo* cert_request_info,
115 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE; 115 const base::Callback<void(net::X509Certificate*)>& callback) OVERRIDE;
116 virtual void AddNewCertificate( 116 virtual void AddNewCertificate(
117 net::URLRequest* request, 117 net::URLRequest* request,
118 net::X509Certificate* cert, 118 net::X509Certificate* cert,
119 int render_process_id, 119 int render_process_id,
120 int render_view_id) OVERRIDE; 120 int render_view_id) OVERRIDE;
121 virtual void RequestMediaAccessPermission( 121 virtual void RequestMediaAccessPermission(
122 const content::MediaStreamRequest* request, 122 const content::MediaStreamRequest* request,
123 const content::MediaResponseCallback& callback) OVERRIDE; 123 const content::MediaResponseCallback& callback) OVERRIDE;
124 virtual content::MediaObserver* GetMediaObserver() OVERRIDE;
124 virtual void RequestDesktopNotificationPermission( 125 virtual void RequestDesktopNotificationPermission(
125 const GURL& source_origin, 126 const GURL& source_origin,
126 int callback_context, 127 int callback_context,
127 int render_process_id, 128 int render_process_id,
128 int render_view_id) OVERRIDE; 129 int render_view_id) OVERRIDE;
129 virtual WebKit::WebNotificationPresenter::Permission 130 virtual WebKit::WebNotificationPresenter::Permission
130 CheckDesktopNotificationPermission( 131 CheckDesktopNotificationPermission(
131 const GURL& source_origin, 132 const GURL& source_origin,
132 content::ResourceContext* context, 133 content::ResourceContext* context,
133 int render_process_id) OVERRIDE; 134 int render_process_id) OVERRIDE;
(...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after
186 private: 187 private:
187 // Set of origins that can use TCP/UDP private APIs from NaCl. 188 // Set of origins that can use TCP/UDP private APIs from NaCl.
188 std::set<std::string> allowed_socket_origins_; 189 std::set<std::string> allowed_socket_origins_;
189 190
190 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 191 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
191 }; 192 };
192 193
193 } // namespace chrome 194 } // namespace chrome
194 195
195 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 196 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698