| OLD | NEW |
| 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/renderer_host/render_widget_host_view_aura.h" | 5 #include "content/browser/renderer_host/render_widget_host_view_aura.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/callback_helpers.h" | 9 #include "base/callback_helpers.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 2368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2379 gfx::IntersectRects(rect, window_->GetBoundsInScreen())); | 2379 gfx::IntersectRects(rect, window_->GetBoundsInScreen())); |
| 2380 | 2380 |
| 2381 if (intersected_rect.IsEmpty()) | 2381 if (intersected_rect.IsEmpty()) |
| 2382 return; | 2382 return; |
| 2383 | 2383 |
| 2384 host_->ScrollFocusedEditableNodeIntoRect( | 2384 host_->ScrollFocusedEditableNodeIntoRect( |
| 2385 ConvertRectFromScreen(intersected_rect)); | 2385 ConvertRectFromScreen(intersected_rect)); |
| 2386 } | 2386 } |
| 2387 | 2387 |
| 2388 void RenderWidgetHostViewAura::OnCandidateWindowShown() { | 2388 void RenderWidgetHostViewAura::OnCandidateWindowShown() { |
| 2389 host_->CandidateWindowShown(); |
| 2389 } | 2390 } |
| 2390 | 2391 |
| 2391 void RenderWidgetHostViewAura::OnCandidateWindowUpdated() { | 2392 void RenderWidgetHostViewAura::OnCandidateWindowUpdated() { |
| 2393 host_->CandidateWindowUpdated(); |
| 2392 } | 2394 } |
| 2393 | 2395 |
| 2394 void RenderWidgetHostViewAura::OnCandidateWindowHidden() { | 2396 void RenderWidgetHostViewAura::OnCandidateWindowHidden() { |
| 2397 host_->CandidateWindowHidden(); |
| 2395 } | 2398 } |
| 2396 | 2399 |
| 2397 //////////////////////////////////////////////////////////////////////////////// | 2400 //////////////////////////////////////////////////////////////////////////////// |
| 2398 // RenderWidgetHostViewAura, gfx::DisplayObserver implementation: | 2401 // RenderWidgetHostViewAura, gfx::DisplayObserver implementation: |
| 2399 | 2402 |
| 2400 void RenderWidgetHostViewAura::OnDisplayBoundsChanged( | 2403 void RenderWidgetHostViewAura::OnDisplayBoundsChanged( |
| 2401 const gfx::Display& display) { | 2404 const gfx::Display& display) { |
| 2402 gfx::Screen* screen = gfx::Screen::GetScreenFor(window_); | 2405 gfx::Screen* screen = gfx::Screen::GetScreenFor(window_); |
| 2403 if (display.id() == screen->GetDisplayNearestWindow(window_).id()) { | 2406 if (display.id() == screen->GetDisplayNearestWindow(window_).id()) { |
| 2404 UpdateScreenInfo(window_); | 2407 UpdateScreenInfo(window_); |
| (...skipping 991 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3396 RenderWidgetHost* widget) { | 3399 RenderWidgetHost* widget) { |
| 3397 return new RenderWidgetHostViewAura(widget); | 3400 return new RenderWidgetHostViewAura(widget); |
| 3398 } | 3401 } |
| 3399 | 3402 |
| 3400 // static | 3403 // static |
| 3401 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { | 3404 void RenderWidgetHostViewPort::GetDefaultScreenInfo(WebScreenInfo* results) { |
| 3402 GetScreenInfoForWindow(results, NULL); | 3405 GetScreenInfoForWindow(results, NULL); |
| 3403 } | 3406 } |
| 3404 | 3407 |
| 3405 } // namespace content | 3408 } // namespace content |
| OLD | NEW |