| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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 "chrome/browser/renderer_host/render_widget_host_view_gtk.h" | 5 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h" |
| 6 | 6 |
| 7 // If this gets included after the gtk headers, then a bunch of compiler | 7 // If this gets included after the gtk headers, then a bunch of compiler |
| 8 // errors happen because of a "#define Status int" in Xlib.h, which interacts | 8 // errors happen because of a "#define Status int" in Xlib.h, which interacts |
| 9 // badly with URLRequestStatus::Status. | 9 // badly with URLRequestStatus::Status. |
| 10 #include "chrome/common/render_messages.h" | 10 #include "chrome/common/render_messages.h" |
| (...skipping 408 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 419 if (parent_) { | 419 if (parent_) { |
| 420 // We're a popup, honor the size request. | 420 // We're a popup, honor the size request. |
| 421 gtk_widget_set_size_request(view_.get(), width, height); | 421 gtk_widget_set_size_request(view_.get(), width, height); |
| 422 } else { | 422 } else { |
| 423 #if defined(TOOLKIT_VIEWS) | 423 #if defined(TOOLKIT_VIEWS) |
| 424 // TOOLKIT_VIEWS' resize logic flow matches windows. so we go ahead and | 424 // TOOLKIT_VIEWS' resize logic flow matches windows. so we go ahead and |
| 425 // size the widget. In GTK+, the size of the widget is determined by it's | 425 // size the widget. In GTK+, the size of the widget is determined by it's |
| 426 // children. | 426 // children. |
| 427 gtk_widget_set_size_request(view_.get(), width, height); | 427 gtk_widget_set_size_request(view_.get(), width, height); |
| 428 #endif | 428 #endif |
| 429 | 429 } |
| 430 if (requested_size_.width() != width || | 430 // Update the size of the RWH. |
| 431 requested_size_.height() != height) { | 431 if (requested_size_.width() != width || |
| 432 requested_size_ = gfx::Size(width, height); | 432 requested_size_.height() != height) { |
| 433 host_->WasResized(); | 433 requested_size_ = gfx::Size(width, height); |
| 434 } | 434 host_->WasResized(); |
| 435 } | 435 } |
| 436 } | 436 } |
| 437 | 437 |
| 438 gfx::NativeView RenderWidgetHostViewGtk::GetNativeView() { | 438 gfx::NativeView RenderWidgetHostViewGtk::GetNativeView() { |
| 439 return view_.get(); | 439 return view_.get(); |
| 440 } | 440 } |
| 441 | 441 |
| 442 void RenderWidgetHostViewGtk::MovePluginWindows( | 442 void RenderWidgetHostViewGtk::MovePluginWindows( |
| 443 const std::vector<webkit_glue::WebPluginGeometry>& moves) { | 443 const std::vector<webkit_glue::WebPluginGeometry>& moves) { |
| 444 for (size_t i = 0; i < moves.size(); ++i) { | 444 for (size_t i = 0; i < moves.size(); ++i) { |
| (...skipping 242 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 687 const NativeWebKeyboardEvent& event) { | 687 const NativeWebKeyboardEvent& event) { |
| 688 if (!host_) | 688 if (!host_) |
| 689 return; | 689 return; |
| 690 | 690 |
| 691 EditCommands edit_commands; | 691 EditCommands edit_commands; |
| 692 if (key_bindings_handler_->Match(event, &edit_commands)) { | 692 if (key_bindings_handler_->Match(event, &edit_commands)) { |
| 693 host_->ForwardEditCommandsForNextKeyEvent(edit_commands); | 693 host_->ForwardEditCommandsForNextKeyEvent(edit_commands); |
| 694 } | 694 } |
| 695 host_->ForwardKeyboardEvent(event); | 695 host_->ForwardKeyboardEvent(event); |
| 696 } | 696 } |
| OLD | NEW |