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

Side by Side Diff: ash/shell/content_client/shell_content_browser_client.h

Issue 14330016: ash_shell: Fix a crash when creating a WebView in the views-examples window. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 8 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 | ash/shell/content_client/shell_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 ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/compiler_specific.h" 10 #include "base/compiler_specific.h"
(...skipping 11 matching lines...) Expand all
22 class ShellBrowserMainParts; 22 class ShellBrowserMainParts;
23 23
24 class ShellContentBrowserClient : public content::ContentBrowserClient { 24 class ShellContentBrowserClient : public content::ContentBrowserClient {
25 public: 25 public:
26 ShellContentBrowserClient(); 26 ShellContentBrowserClient();
27 virtual ~ShellContentBrowserClient(); 27 virtual ~ShellContentBrowserClient();
28 28
29 // Overridden from content::ContentBrowserClient: 29 // Overridden from content::ContentBrowserClient:
30 virtual content::BrowserMainParts* CreateBrowserMainParts( 30 virtual content::BrowserMainParts* CreateBrowserMainParts(
31 const content::MainFunctionParams& parameters) OVERRIDE; 31 const content::MainFunctionParams& parameters) OVERRIDE;
32 virtual net::URLRequestContextGetter* CreateRequestContext(
33 content::BrowserContext* browser_context,
34 content::ProtocolHandlerMap* protocol_handlers) OVERRIDE;
32 35
33 content::ShellBrowserContext* browser_context(); 36 content::ShellBrowserContext* browser_context();
34 37
35 private: 38 private:
36 ShellBrowserMainParts* shell_browser_main_parts_; 39 ShellBrowserMainParts* shell_browser_main_parts_;
37 40
38 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); 41 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient);
39 }; 42 };
40 43
41 } // namespace shell 44 } // namespace shell
42 } // namespace ash 45 } // namespace ash
43 46
44 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_ 47 #endif // ASH_SHELL_CONTENT_CLIENT_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « no previous file | ash/shell/content_client/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698