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

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

Issue 11437038: Revert 171408 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 years 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 7
8 #include <set> 8 #include <set>
9 #include <string> 9 #include <string>
10 #include <utility> 10 #include <utility>
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
206 virtual FilePath GetDefaultDownloadDirectory() OVERRIDE; 206 virtual FilePath GetDefaultDownloadDirectory() OVERRIDE;
207 virtual std::string GetDefaultDownloadName() OVERRIDE; 207 virtual std::string GetDefaultDownloadName() OVERRIDE;
208 virtual void DidCreatePpapiPlugin( 208 virtual void DidCreatePpapiPlugin(
209 content::BrowserPpapiHost* browser_host) OVERRIDE; 209 content::BrowserPpapiHost* browser_host) OVERRIDE;
210 virtual content::BrowserPpapiHost* GetExternalBrowserPpapiHost( 210 virtual content::BrowserPpapiHost* GetExternalBrowserPpapiHost(
211 int plugin_process_id) OVERRIDE; 211 int plugin_process_id) OVERRIDE;
212 virtual bool AllowPepperSocketAPI( 212 virtual bool AllowPepperSocketAPI(
213 content::BrowserContext* browser_context, 213 content::BrowserContext* browser_context,
214 const GURL& url, 214 const GURL& url,
215 const content::SocketPermissionRequest& params) OVERRIDE; 215 const content::SocketPermissionRequest& params) OVERRIDE;
216 virtual bool AllowPepperPrivateFileAPI() OVERRIDE;
216 virtual FilePath GetHyphenDictionaryDirectory() OVERRIDE; 217 virtual FilePath GetHyphenDictionaryDirectory() OVERRIDE;
217 218
218 #if defined(OS_POSIX) && !defined(OS_MACOSX) 219 #if defined(OS_POSIX) && !defined(OS_MACOSX)
219 virtual void GetAdditionalMappedFilesForChildProcess( 220 virtual void GetAdditionalMappedFilesForChildProcess(
220 const CommandLine& command_line, 221 const CommandLine& command_line,
221 int child_process_id, 222 int child_process_id,
222 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE; 223 std::vector<content::FileDescriptorInfo>* mappings) OVERRIDE;
223 #endif 224 #endif
224 #if defined(OS_WIN) 225 #if defined(OS_WIN)
225 virtual const wchar_t* GetResourceDllName() OVERRIDE; 226 virtual const wchar_t* GetResourceDllName() OVERRIDE;
(...skipping 24 matching lines...) Expand all
250 // Cached version of the locale so we can return the locale on the I/O 251 // Cached version of the locale so we can return the locale on the I/O
251 // thread. 252 // thread.
252 std::string io_thread_application_locale_; 253 std::string io_thread_application_locale_;
253 254
254 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient); 255 DISALLOW_COPY_AND_ASSIGN(ChromeContentBrowserClient);
255 }; 256 };
256 257
257 } // namespace chrome 258 } // namespace chrome
258 259
259 #endif // CHROME_BROWSER_CHROME_CONTENT_BROWSER_CLIENT_H_ 260 #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