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

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

Issue 1656983002: Remove dependency from content_renderer on startup_metric_utils_common. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: format Created 4 years, 10 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 (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>
(...skipping 167 matching lines...) Expand 10 before | Expand all | Expand 10 after
178 #endif 178 #endif
179 179
180 private: 180 private:
181 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction); 181 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, NaClRestriction);
182 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest, 182 FRIEND_TEST_ALL_PREFIXES(ChromeContentRendererClientTest,
183 ShouldSuppressErrorPage); 183 ShouldSuppressErrorPage);
184 184
185 static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type, 185 static GURL GetNaClContentHandlerURL(const std::string& actual_mime_type,
186 const content::WebPluginInfo& plugin); 186 const content::WebPluginInfo& plugin);
187 187
188 // Time at which this object was created. This is very close to the time at
189 // which the RendererMain function was entered.
190 base::TimeTicks renderer_main_entry_time_;
191
188 #if !defined(DISABLE_NACL) 192 #if !defined(DISABLE_NACL)
189 // Determines if a NaCl app is allowed, and modifies params to pass the app's 193 // Determines if a NaCl app is allowed, and modifies params to pass the app's
190 // permissions to the trusted NaCl plugin. 194 // permissions to the trusted NaCl plugin.
191 static bool IsNaClAllowed(const GURL& manifest_url, 195 static bool IsNaClAllowed(const GURL& manifest_url,
192 const GURL& app_url, 196 const GURL& app_url,
193 bool is_nacl_unrestricted, 197 bool is_nacl_unrestricted,
194 const extensions::Extension* extension, 198 const extensions::Extension* extension,
195 blink::WebPluginParams* params); 199 blink::WebPluginParams* params);
196 #endif 200 #endif
197 201
(...skipping 17 matching lines...) Expand all
215 #if defined(ENABLE_PRINT_PREVIEW) 219 #if defined(ENABLE_PRINT_PREVIEW)
216 scoped_ptr<ChromePDFPrintClient> pdf_print_client_; 220 scoped_ptr<ChromePDFPrintClient> pdf_print_client_;
217 #endif 221 #endif
218 #if defined(ENABLE_PLUGINS) 222 #if defined(ENABLE_PLUGINS)
219 std::set<std::string> allowed_camera_device_origins_; 223 std::set<std::string> allowed_camera_device_origins_;
220 std::set<std::string> allowed_compositor_origins_; 224 std::set<std::string> allowed_compositor_origins_;
221 #endif 225 #endif
222 }; 226 };
223 227
224 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_ 228 #endif // CHROME_RENDERER_CHROME_CONTENT_RENDERER_CLIENT_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698