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

Side by Side Diff: chrome/renderer/chrome_content_renderer_client.h

Issue 2479593006: Move enable extensions define to a build flag. (Closed)
Patch Set: Merge Created 4 years, 1 month 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
« no previous file with comments | « chrome/renderer/DEPS ('k') | chrome/renderer/chrome_content_renderer_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_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 5 #ifndef CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 6 #define CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
7 7
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <map> 10 #include <map>
11 #include <memory> 11 #include <memory>
12 #include <set> 12 #include <set>
13 #include <string> 13 #include <string>
14 #include <vector> 14 #include <vector>
15 15
16 #include "base/compiler_specific.h" 16 #include "base/compiler_specific.h"
17 #include "base/gtest_prod_util.h" 17 #include "base/gtest_prod_util.h"
18 #include "base/strings/string16.h" 18 #include "base/strings/string16.h"
19 #include "components/rappor/public/interfaces/rappor_recorder.mojom.h" 19 #include "components/rappor/public/interfaces/rappor_recorder.mojom.h"
20 #include "content/public/renderer/content_renderer_client.h" 20 #include "content/public/renderer/content_renderer_client.h"
21 #include "extensions/features/features.h"
21 #include "ipc/ipc_channel_proxy.h" 22 #include "ipc/ipc_channel_proxy.h"
22 #include "printing/features/features.h" 23 #include "printing/features/features.h"
23 #include "v8/include/v8.h" 24 #include "v8/include/v8.h"
24 25
25 #if defined (OS_CHROMEOS) 26 #if defined (OS_CHROMEOS)
26 #include "chrome/renderer/leak_detector/leak_detector_remote_client.h" 27 #include "chrome/renderer/leak_detector/leak_detector_remote_client.h"
27 #endif 28 #endif
28 29
29 class ChromeRenderThreadObserver; 30 class ChromeRenderThreadObserver;
30 #if BUILDFLAG(ENABLE_PRINT_PREVIEW) 31 #if BUILDFLAG(ENABLE_PRINT_PREVIEW)
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after
192 #endif 193 #endif
193 194
194 #if defined(ENABLE_PLUGINS) 195 #if defined(ENABLE_PLUGINS)
195 static blink::WebPlugin* CreatePlugin( 196 static blink::WebPlugin* CreatePlugin(
196 content::RenderFrame* render_frame, 197 content::RenderFrame* render_frame,
197 blink::WebLocalFrame* frame, 198 blink::WebLocalFrame* frame,
198 const blink::WebPluginParams& params, 199 const blink::WebPluginParams& params,
199 const ChromeViewHostMsg_GetPluginInfo_Output& output); 200 const ChromeViewHostMsg_GetPluginInfo_Output& output);
200 #endif 201 #endif
201 202
202 #if defined(ENABLE_PLUGINS) && defined(ENABLE_EXTENSIONS) 203 #if defined(ENABLE_PLUGINS) && BUILDFLAG(ENABLE_EXTENSIONS)
203 static bool IsExtensionOrSharedModuleWhitelisted( 204 static bool IsExtensionOrSharedModuleWhitelisted(
204 const GURL& url, const std::set<std::string>& whitelist); 205 const GURL& url, const std::set<std::string>& whitelist);
205 #endif 206 #endif
206 207
207 private: 208 private:
208 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction); 209 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction);
209 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, 210 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest,
210 ShouldSuppressErrorPage); 211 ShouldSuppressErrorPage);
211 212
212 static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type, 213 static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type,
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
253 #endif 254 #endif
254 255
255 #if defined(OS_CHROMEOS) 256 #if defined(OS_CHROMEOS)
256 std::unique_ptr<LeakDetectorRemoteClient> leak_detector_remote_client_; 257 std::unique_ptr<LeakDetectorRemoteClient> leak_detector_remote_client_;
257 #endif 258 #endif
258 259
259 DISALLOW_COPY_AND_ASSIGN(ChromeContentRendererClient); 260 DISALLOW_COPY_AND_ASSIGN(ChromeContentRendererClient);
260 }; 261 };
261 262
262 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 263 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW
« no previous file with comments | « chrome/renderer/DEPS ('k') | chrome/renderer/chrome_content_renderer_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698