| 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 "content/renderer/npapi/webplugin_delegate_proxy.h" | 5 #include "content/renderer/npapi/webplugin_delegate_proxy.h" |
| 6 | 6 |
| 7 #if defined(TOOLKIT_GTK) | 7 #if defined(USE_X11) |
| 8 #include <gtk/gtk.h> | |
| 9 #elif defined(USE_X11) | |
| 10 #include <cairo/cairo.h> | 8 #include <cairo/cairo.h> |
| 11 #endif | 9 #endif |
| 12 | 10 |
| 13 #include <algorithm> | 11 #include <algorithm> |
| 14 | 12 |
| 15 #include "base/auto_reset.h" | 13 #include "base/auto_reset.h" |
| 16 #include "base/basictypes.h" | 14 #include "base/basictypes.h" |
| 17 #include "base/command_line.h" | 15 #include "base/command_line.h" |
| 18 #include "base/file_util.h" | 16 #include "base/file_util.h" |
| 19 #include "base/logging.h" | 17 #include "base/logging.h" |
| (...skipping 1220 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1240 | 1238 |
| 1241 plugin_->URLRedirectResponse(allow, resource_id); | 1239 plugin_->URLRedirectResponse(allow, resource_id); |
| 1242 } | 1240 } |
| 1243 | 1241 |
| 1244 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url, | 1242 void WebPluginDelegateProxy::OnCheckIfRunInsecureContent(const GURL& url, |
| 1245 bool* result) { | 1243 bool* result) { |
| 1246 *result = plugin_->CheckIfRunInsecureContent(url); | 1244 *result = plugin_->CheckIfRunInsecureContent(url); |
| 1247 } | 1245 } |
| 1248 | 1246 |
| 1249 } // namespace content | 1247 } // namespace content |
| OLD | NEW |