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

Side by Side Diff: content/browser/browser_plugin/browser_plugin_guest.cc

Issue 134683004: Disabled pinch zooming in non-browser Aura windows. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 | Annotate | Revision Log
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 #include "content/browser/browser_plugin/browser_plugin_guest.h" 5 #include "content/browser/browser_plugin/browser_plugin_guest.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 8
9 #include "base/message_loop/message_loop.h" 9 #include "base/message_loop/message_loop.h"
10 #include "base/strings/string_util.h" 10 #include "base/strings/string_util.h"
(...skipping 1680 matching lines...) Expand 10 before | Expand all | Expand 10 after
1691 base::DictionaryValue request_info; 1691 base::DictionaryValue request_info;
1692 request_info.Set( 1692 request_info.Set(
1693 browser_plugin::kURL, 1693 browser_plugin::kURL,
1694 base::Value::CreateStringValue(request.security_origin.spec())); 1694 base::Value::CreateStringValue(request.security_origin.spec()));
1695 1695
1696 RequestPermission(BROWSER_PLUGIN_PERMISSION_TYPE_MEDIA, 1696 RequestPermission(BROWSER_PLUGIN_PERMISSION_TYPE_MEDIA,
1697 new MediaRequest(request, callback, this), 1697 new MediaRequest(request, callback, this),
1698 request_info); 1698 request_info);
1699 } 1699 }
1700 1700
1701 bool BrowserPluginGuest::PreHandleGestureEvent(
1702 WebContents* source, const blink::WebGestureEvent& event) {
1703 return event.type == blink::WebGestureEvent::GesturePinchBegin ||
1704 event.type == blink::WebGestureEvent::GesturePinchUpdate ||
1705 event.type == blink::WebGestureEvent::GesturePinchEnd;
1706 }
1707
1701 void BrowserPluginGuest::RunJavaScriptDialog( 1708 void BrowserPluginGuest::RunJavaScriptDialog(
1702 WebContents* web_contents, 1709 WebContents* web_contents,
1703 const GURL& origin_url, 1710 const GURL& origin_url,
1704 const std::string& accept_lang, 1711 const std::string& accept_lang,
1705 JavaScriptMessageType javascript_message_type, 1712 JavaScriptMessageType javascript_message_type,
1706 const base::string16& message_text, 1713 const base::string16& message_text,
1707 const base::string16& default_prompt_text, 1714 const base::string16& default_prompt_text,
1708 const DialogClosedCallback& callback, 1715 const DialogClosedCallback& callback,
1709 bool* did_suppress_message) { 1716 bool* did_suppress_message) {
1710 base::DictionaryValue request_info; 1717 base::DictionaryValue request_info;
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
1851 request_info.Set(browser_plugin::kRequestMethod, 1858 request_info.Set(browser_plugin::kRequestMethod,
1852 base::Value::CreateStringValue(request_method)); 1859 base::Value::CreateStringValue(request_method));
1853 request_info.Set(browser_plugin::kURL, base::Value::CreateStringValue(url)); 1860 request_info.Set(browser_plugin::kURL, base::Value::CreateStringValue(url));
1854 1861
1855 RequestPermission(BROWSER_PLUGIN_PERMISSION_TYPE_DOWNLOAD, 1862 RequestPermission(BROWSER_PLUGIN_PERMISSION_TYPE_DOWNLOAD,
1856 new DownloadRequest(callback), 1863 new DownloadRequest(callback),
1857 request_info); 1864 request_info);
1858 } 1865 }
1859 1866
1860 } // namespace content 1867 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/browser_plugin/browser_plugin_guest.h ('k') | content/browser/renderer_host/render_widget_host_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698