Chromium Code Reviews| OLD | NEW |
|---|---|
| 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 #include "chrome/renderer/chrome_content_renderer_client.h" | 5 #include "chrome/renderer/chrome_content_renderer_client.h" |
| 6 | 6 |
| 7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
| 8 #include "base/debug/crash_logging.h" | 8 #include "base/debug/crash_logging.h" |
| 9 #include "base/logging.h" | 9 #include "base/logging.h" |
| 10 #include "base/metrics/field_trial.h" | 10 #include "base/metrics/field_trial.h" |
| (...skipping 1366 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1377 if (url.host() == chrome::kChromeUIThumbnailHost) | 1377 if (url.host() == chrome::kChromeUIThumbnailHost) |
| 1378 return search_box->GenerateThumbnailURLFromTransientURL(url, new_url); | 1378 return search_box->GenerateThumbnailURLFromTransientURL(url, new_url); |
| 1379 else if (url.host() == chrome::kChromeUIFaviconHost) | 1379 else if (url.host() == chrome::kChromeUIFaviconHost) |
| 1380 return search_box->GenerateFaviconURLFromTransientURL(url, new_url); | 1380 return search_box->GenerateFaviconURLFromTransientURL(url, new_url); |
| 1381 } | 1381 } |
| 1382 | 1382 |
| 1383 return false; | 1383 return false; |
| 1384 } | 1384 } |
| 1385 | 1385 |
| 1386 void ChromeContentRendererClient::DidCreateScriptContext( | 1386 void ChromeContentRendererClient::DidCreateScriptContext( |
| 1387 WebFrame* frame, v8::Handle<v8::Context> context, int extension_group, | 1387 WebLocalFrame* frame, |
|
nasko
2015/03/07 00:42:18
nit: blink::WebLocalFrame
not at google - send to devlin
2015/03/09 16:25:14
Done, and it bothered me enough to update the othe
| |
| 1388 v8::Handle<v8::Context> context, | |
| 1389 int extension_group, | |
| 1388 int world_id) { | 1390 int world_id) { |
| 1389 #if defined(ENABLE_EXTENSIONS) | 1391 #if defined(ENABLE_EXTENSIONS) |
| 1390 extension_dispatcher_->DidCreateScriptContext( | 1392 extension_dispatcher_->DidCreateScriptContext( |
| 1391 frame, context, extension_group, world_id); | 1393 frame, context, extension_group, world_id); |
| 1392 #endif | 1394 #endif |
| 1393 } | 1395 } |
| 1394 | 1396 |
| 1395 unsigned long long ChromeContentRendererClient::VisitedLinkHash( | 1397 unsigned long long ChromeContentRendererClient::VisitedLinkHash( |
| 1396 const char* canonical_url, size_t length) { | 1398 const char* canonical_url, size_t length) { |
| 1397 return visited_link_slave_->ComputeURLFingerprint(canonical_url, length); | 1399 return visited_link_slave_->ComputeURLFingerprint(canonical_url, length); |
| (...skipping 248 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 1646 if (mime_type == content::kBrowserPluginMimeType) { | 1648 if (mime_type == content::kBrowserPluginMimeType) { |
| 1647 return new extensions::ExtensionsGuestViewContainer(render_frame); | 1649 return new extensions::ExtensionsGuestViewContainer(render_frame); |
| 1648 } else { | 1650 } else { |
| 1649 return new extensions::MimeHandlerViewContainer( | 1651 return new extensions::MimeHandlerViewContainer( |
| 1650 render_frame, mime_type, original_url); | 1652 render_frame, mime_type, original_url); |
| 1651 } | 1653 } |
| 1652 #else | 1654 #else |
| 1653 return NULL; | 1655 return NULL; |
| 1654 #endif | 1656 #endif |
| 1655 } | 1657 } |
| OLD | NEW |