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

Side by Side Diff: ui/keyboard/content/keyboard_ui_content.cc

Issue 1303773002: Give the main frame a RenderWidget. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix merge conflicts Created 5 years, 1 month 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
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/content/keyboard_ui_content.h" 5 #include "ui/keyboard/content/keyboard_ui_content.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/render_widget_host.h" 9 #include "content/public/browser/render_widget_host.h"
10 #include "content/public/browser/render_widget_host_iterator.h" 10 #include "content/public/browser/render_widget_host_iterator.h"
(...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after
51 bool CanDragEnter(content::WebContents* source, 51 bool CanDragEnter(content::WebContents* source,
52 const content::DropData& data, 52 const content::DropData& data,
53 blink::WebDragOperationsMask operations_allowed) override { 53 blink::WebDragOperationsMask operations_allowed) override {
54 return false; 54 return false;
55 } 55 }
56 56
57 bool ShouldCreateWebContents( 57 bool ShouldCreateWebContents(
58 content::WebContents* web_contents, 58 content::WebContents* web_contents,
59 int route_id, 59 int route_id,
60 int main_frame_route_id, 60 int main_frame_route_id,
61 int main_frame_widget_route_id,
61 WindowContainerType window_container_type, 62 WindowContainerType window_container_type,
62 const std::string& frame_name, 63 const std::string& frame_name,
63 const GURL& target_url, 64 const GURL& target_url,
64 const std::string& partition_id, 65 const std::string& partition_id,
65 content::SessionStorageNamespace* session_storage_namespace) override { 66 content::SessionStorageNamespace* session_storage_namespace) override {
66 return false; 67 return false;
67 } 68 }
68 69
69 bool IsPopupOrPanel(const content::WebContents* source) const override { 70 bool IsPopupOrPanel(const content::WebContents* source) const override {
70 return true; 71 return true;
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 keyboard_controller()->keyboard_visible()); 321 keyboard_controller()->keyboard_visible());
321 } 322 }
322 323
323 void KeyboardUIContent::AddBoundsChangedObserver(aura::Window* window) { 324 void KeyboardUIContent::AddBoundsChangedObserver(aura::Window* window) {
324 aura::Window* target_window = window ? window->GetToplevelWindow() : nullptr; 325 aura::Window* target_window = window ? window->GetToplevelWindow() : nullptr;
325 if (target_window) 326 if (target_window)
326 window_bounds_observer_->AddObservedWindow(target_window); 327 window_bounds_observer_->AddObservedWindow(target_window);
327 } 328 }
328 329
329 } // namespace keyboard 330 } // namespace keyboard
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698