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

Side by Side Diff: ui/keyboard/keyboard_controller_proxy.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
« no previous file with comments | « content/public/browser/web_contents_delegate.cc ('k') | ui/web_dialogs/DEPS » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/keyboard/keyboard_controller_proxy.h" 5 #include "ui/keyboard/keyboard_controller_proxy.h"
6 6
7 #include "base/values.h" 7 #include "base/values.h"
8 #include "content/public/browser/site_instance.h" 8 #include "content/public/browser/site_instance.h"
9 #include "content/public/browser/web_contents.h" 9 #include "content/public/browser/web_contents.h"
10 #include "content/public/browser/web_contents.h" 10 #include "content/public/browser/web_contents.h"
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
89 proxy_->set_resizing_from_contents(false); 89 proxy_->set_resizing_from_contents(false);
90 } 90 }
91 91
92 // Overridden from content::WebContentsDelegate: 92 // Overridden from content::WebContentsDelegate:
93 virtual void RequestMediaAccessPermission(content::WebContents* web_contents, 93 virtual void RequestMediaAccessPermission(content::WebContents* web_contents,
94 const content::MediaStreamRequest& request, 94 const content::MediaStreamRequest& request,
95 const content::MediaResponseCallback& callback) OVERRIDE { 95 const content::MediaResponseCallback& callback) OVERRIDE {
96 proxy_->RequestAudioInput(web_contents, request, callback); 96 proxy_->RequestAudioInput(web_contents, request, callback);
97 } 97 }
98 98
99
100 // Overridden from content::WebContentsObserver: 99 // Overridden from content::WebContentsObserver:
101 virtual void WebContentsDestroyed(content::WebContents* contents) OVERRIDE { 100 virtual void WebContentsDestroyed(content::WebContents* contents) OVERRIDE {
102 delete this; 101 delete this;
103 } 102 }
104 103
105 keyboard::KeyboardControllerProxy* proxy_; 104 keyboard::KeyboardControllerProxy* proxy_;
106 105
107 DISALLOW_COPY_AND_ASSIGN(KeyboardContentsDelegate); 106 DISALLOW_COPY_AND_ASSIGN(KeyboardContentsDelegate);
108 }; 107 };
109 108
(...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after
182 base::DictionaryValue input_context; 181 base::DictionaryValue input_context;
183 input_context.SetString("type", TextInputTypeToString(type)); 182 input_context.SetString("type", TextInputTypeToString(type));
184 webui->CallJavascriptFunction("OnTextInputBoxFocused", input_context); 183 webui->CallJavascriptFunction("OnTextInputBoxFocused", input_context);
185 } 184 }
186 } 185 }
187 186
188 void KeyboardControllerProxy::SetupWebContents(content::WebContents* contents) { 187 void KeyboardControllerProxy::SetupWebContents(content::WebContents* contents) {
189 } 188 }
190 189
191 } // namespace keyboard 190 } // namespace keyboard
OLDNEW
« no previous file with comments | « content/public/browser/web_contents_delegate.cc ('k') | ui/web_dialogs/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698