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

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

Issue 14329020: Implementing uploading of a WebRTC diagnostic log. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed pre-submit warnings/errors (including adding bzip2 to content/browser DEPS). Created 7 years, 7 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
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 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
11 #include <vector> 11 #include <vector>
12 12
13 #include "base/compiler_specific.h" 13 #include "base/compiler_specific.h"
14 #include "base/platform_file.h"
14 #include "content/public/browser/content_browser_client.h" 15 #include "content/public/browser/content_browser_client.h"
15 16
16 #if defined(OS_ANDROID) 17 #if defined(OS_ANDROID)
17 #include "base/memory/scoped_ptr.h" 18 #include "base/memory/scoped_ptr.h"
18 #endif 19 #endif
19 20
20 namespace content { 21 namespace content {
21 class QuotaPermissionContext; 22 class QuotaPermissionContext;
22 } 23 }
23 24
(...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after
239 virtual const wchar_t* GetResourceDllName() OVERRIDE; 240 virtual const wchar_t* GetResourceDllName() OVERRIDE;
240 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy, 241 virtual void PreSpawnRenderer(sandbox::TargetPolicy* policy,
241 bool* success) OVERRIDE; 242 bool* success) OVERRIDE;
242 #endif 243 #endif
243 #if defined(USE_NSS) 244 #if defined(USE_NSS)
244 virtual 245 virtual
245 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate( 246 crypto::CryptoModuleBlockingPasswordDelegate* GetCryptoPasswordDelegate(
246 const GURL& url) OVERRIDE; 247 const GURL& url) OVERRIDE;
247 #endif 248 #endif
248 249
250 virtual base::PlatformFile CreateWebRtcLogFile() OVERRIDE;
251 virtual void UploadWebRtcLog(base::PlatformFile log_file) OVERRIDE;
252
249 private: 253 private:
250 // Set of origins that can use TCP/UDP private APIs from NaCl. 254 // Set of origins that can use TCP/UDP private APIs from NaCl.
251 std::set<std::string> allowed_socket_origins_; 255 std::set<std::string> allowed_socket_origins_;
252 256
253 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 257 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
254 }; 258 };
255 259
256 } // namespace chrome 260 } // namespace chrome
257 261
258 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 262 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698