OLD | NEW |
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/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/values.h" | 8 #include "base/values.h" |
9 #include "content/public/browser/site_instance.h" | 9 #include "content/public/browser/site_instance.h" |
10 #include "content/public/browser/web_contents.h" | 10 #include "content/public/browser/web_contents.h" |
(...skipping 35 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
46 } | 46 } |
47 | 47 |
48 bool CanDragEnter(content::WebContents* source, | 48 bool CanDragEnter(content::WebContents* source, |
49 const content::DropData& data, | 49 const content::DropData& data, |
50 blink::WebDragOperationsMask operations_allowed) override { | 50 blink::WebDragOperationsMask operations_allowed) override { |
51 return false; | 51 return false; |
52 } | 52 } |
53 | 53 |
54 bool ShouldCreateWebContents( | 54 bool ShouldCreateWebContents( |
55 content::WebContents* web_contents, | 55 content::WebContents* web_contents, |
56 int route_id, | 56 int32 route_id, |
57 int main_frame_route_id, | 57 int32 main_frame_route_id, |
| 58 int32 main_frame_widget_route_id, |
| 59 int32 surface_id, |
58 WindowContainerType window_container_type, | 60 WindowContainerType window_container_type, |
59 const std::string& frame_name, | 61 const std::string& frame_name, |
60 const GURL& target_url, | 62 const GURL& target_url, |
61 const std::string& partition_id, | 63 const std::string& partition_id, |
62 content::SessionStorageNamespace* session_storage_namespace) override { | 64 content::SessionStorageNamespace* session_storage_namespace) override { |
63 return false; | 65 return false; |
64 } | 66 } |
65 | 67 |
66 bool IsPopupOrPanel(const content::WebContents* source) const override { | 68 bool IsPopupOrPanel(const content::WebContents* source) const override { |
67 return true; | 69 return true; |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
223 } | 225 } |
224 | 226 |
225 shadow_->SetContentBounds(new_bounds); | 227 shadow_->SetContentBounds(new_bounds); |
226 } | 228 } |
227 | 229 |
228 void KeyboardControllerProxy::OnWindowDestroyed(aura::Window* window) { | 230 void KeyboardControllerProxy::OnWindowDestroyed(aura::Window* window) { |
229 window->RemoveObserver(this); | 231 window->RemoveObserver(this); |
230 } | 232 } |
231 | 233 |
232 } // namespace keyboard | 234 } // namespace keyboard |
OLD | NEW |