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/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 778 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
789 placeholder = ChromePluginPlaceholder::CreateBlockedPlugin( | 789 placeholder = ChromePluginPlaceholder::CreateBlockedPlugin( |
790 render_frame, | 790 render_frame, |
791 frame, | 791 frame, |
792 params, | 792 params, |
793 plugin, | 793 plugin, |
794 identifier, | 794 identifier, |
795 group_name, | 795 group_name, |
796 IDR_BLOCKED_PLUGIN_HTML, | 796 IDR_BLOCKED_PLUGIN_HTML, |
797 l10n_util::GetStringFUTF16(IDS_PLUGIN_NOT_AUTHORIZED, group_name)); | 797 l10n_util::GetStringFUTF16(IDS_PLUGIN_NOT_AUTHORIZED, group_name)); |
798 placeholder->set_allow_loading(true); | 798 placeholder->set_allow_loading(true); |
799 // Send IPC for showing infobar. | |
799 render_frame->Send(new ChromeViewHostMsg_BlockedUnauthorizedPlugin( | 800 render_frame->Send(new ChromeViewHostMsg_BlockedUnauthorizedPlugin( |
800 render_frame->GetRoutingID(), | 801 render_frame->GetRoutingID(), |
801 group_name, | 802 group_name, |
802 identifier)); | 803 identifier)); |
804 // Send IPC for showing content_setting_image/bubble. | |
805 observer->DidBlockContentType(content_type); | |
sky
2014/06/12 20:00:33
Why isn't ChromeViewHostMsg_BlockedUnauthorizedPlu
radhikabhar
2014/06/12 20:37:19
In the new UI the infobar will be placed behind a
sky
2014/06/12 22:56:31
I don't understand why that means a new message ne
radhikabhar
2014/06/12 23:41:33
One question - Are you thinking about adding this
| |
803 break; | 806 break; |
804 } | 807 } |
805 case ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay: { | 808 case ChromeViewHostMsg_GetPluginInfo_Status::kClickToPlay: { |
806 placeholder = ChromePluginPlaceholder::CreateBlockedPlugin( | 809 placeholder = ChromePluginPlaceholder::CreateBlockedPlugin( |
807 render_frame, | 810 render_frame, |
808 frame, | 811 frame, |
809 params, | 812 params, |
810 plugin, | 813 plugin, |
811 identifier, | 814 identifier, |
812 group_name, | 815 group_name, |
(...skipping 630 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
1443 CommandLine* command_line = CommandLine::ForCurrentProcess(); | 1446 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
1444 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); | 1447 return !command_line->HasSwitch(extensions::switches::kExtensionProcess); |
1445 } | 1448 } |
1446 | 1449 |
1447 blink::WebWorkerPermissionClientProxy* | 1450 blink::WebWorkerPermissionClientProxy* |
1448 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( | 1451 ChromeContentRendererClient::CreateWorkerPermissionClientProxy( |
1449 content::RenderFrame* render_frame, | 1452 content::RenderFrame* render_frame, |
1450 blink::WebFrame* frame) { | 1453 blink::WebFrame* frame) { |
1451 return new WorkerPermissionClientProxy(render_frame, frame); | 1454 return new WorkerPermissionClientProxy(render_frame, frame); |
1452 } | 1455 } |
OLD | NEW |