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

Side by Side Diff: extensions/shell/browser/shell_content_browser_client.h

Issue 2618393003: Remove ScopedVector from ContentBrowserClient. (Closed)
Patch Set: rebase Created 3 years, 11 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
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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 EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 5 #ifndef EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
6 #define EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 6 #define EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
7 7
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/macros.h" 9 #include "base/macros.h"
10 #include "content/public/browser/content_browser_client.h" 10 #include "content/public/browser/content_browser_client.h"
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 void SiteInstanceDeleting(content::SiteInstance* site_instance) override; 49 void SiteInstanceDeleting(content::SiteInstance* site_instance) override;
50 void AppendExtraCommandLineSwitches(base::CommandLine* command_line, 50 void AppendExtraCommandLineSwitches(base::CommandLine* command_line,
51 int child_process_id) override; 51 int child_process_id) override;
52 content::SpeechRecognitionManagerDelegate* 52 content::SpeechRecognitionManagerDelegate*
53 CreateSpeechRecognitionManagerDelegate() override; 53 CreateSpeechRecognitionManagerDelegate() override;
54 content::BrowserPpapiHost* GetExternalBrowserPpapiHost( 54 content::BrowserPpapiHost* GetExternalBrowserPpapiHost(
55 int plugin_process_id) override; 55 int plugin_process_id) override;
56 void GetAdditionalAllowedSchemesForFileSystem( 56 void GetAdditionalAllowedSchemesForFileSystem(
57 std::vector<std::string>* additional_schemes) override; 57 std::vector<std::string>* additional_schemes) override;
58 content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override; 58 content::DevToolsManagerDelegate* GetDevToolsManagerDelegate() override;
59 ScopedVector<content::NavigationThrottle> CreateThrottlesForNavigation( 59 std::vector<std::unique_ptr<content::NavigationThrottle>>
60 CreateThrottlesForNavigation(
60 content::NavigationHandle* navigation_handle) override; 61 content::NavigationHandle* navigation_handle) override;
61 std::unique_ptr<content::NavigationUIData> GetNavigationUIData( 62 std::unique_ptr<content::NavigationUIData> GetNavigationUIData(
62 content::NavigationHandle* navigation_handle) override; 63 content::NavigationHandle* navigation_handle) override;
63 64
64 protected: 65 protected:
65 // Subclasses may wish to provide their own ShellBrowserMainParts. 66 // Subclasses may wish to provide their own ShellBrowserMainParts.
66 virtual ShellBrowserMainParts* CreateShellBrowserMainParts( 67 virtual ShellBrowserMainParts* CreateShellBrowserMainParts(
67 const content::MainFunctionParams& parameters, 68 const content::MainFunctionParams& parameters,
68 ShellBrowserMainDelegate* browser_main_delegate); 69 ShellBrowserMainDelegate* browser_main_delegate);
69 70
70 private: 71 private:
71 // Appends command line switches for a renderer process. 72 // Appends command line switches for a renderer process.
72 void AppendRendererSwitches(base::CommandLine* command_line); 73 void AppendRendererSwitches(base::CommandLine* command_line);
73 74
74 // Returns the extension or app associated with |site_instance| or NULL. 75 // Returns the extension or app associated with |site_instance| or NULL.
75 const Extension* GetExtension(content::SiteInstance* site_instance); 76 const Extension* GetExtension(content::SiteInstance* site_instance);
76 77
77 // Owned by content::BrowserMainLoop. 78 // Owned by content::BrowserMainLoop.
78 ShellBrowserMainParts* browser_main_parts_; 79 ShellBrowserMainParts* browser_main_parts_;
79 80
80 // Owned by ShellBrowserMainParts. 81 // Owned by ShellBrowserMainParts.
81 ShellBrowserMainDelegate* browser_main_delegate_; 82 ShellBrowserMainDelegate* browser_main_delegate_;
82 83
83 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient); 84 DISALLOW_COPY_AND_ASSIGN(ShellContentBrowserClient);
84 }; 85 };
85 86
86 } // namespace extensions 87 } // namespace extensions
87 88
88 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_ 89 #endif // EXTENSIONS_SHELL_BROWSER_SHELL_CONTENT_BROWSER_CLIENT_H_
OLDNEW
« no previous file with comments | « content/public/test/test_file_system_context.cc ('k') | extensions/shell/browser/shell_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698