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/web_contents/web_contents_view_aura.h" | 5 #include "content/browser/web_contents/web_contents_view_aura.h" |
6 | 6 |
7 #include "base/auto_reset.h" | 7 #include "base/auto_reset.h" |
8 #include "base/command_line.h" | 8 #include "base/command_line.h" |
9 #include "base/files/file_util.h" | 9 #include "base/files/file_util.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 1454 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1465 web_contents_->GetRenderWidgetHostView()); | 1465 web_contents_->GetRenderWidgetHostView()); |
1466 if (view != NULL && !view->IsClosing()) | 1466 if (view != NULL && !view->IsClosing()) |
1467 return true; | 1467 return true; |
1468 | 1468 |
1469 return false; | 1469 return false; |
1470 } | 1470 } |
1471 | 1471 |
1472 void WebContentsViewAura::OnCaptureLost() { | 1472 void WebContentsViewAura::OnCaptureLost() { |
1473 } | 1473 } |
1474 | 1474 |
1475 void WebContentsViewAura::OnPaint(gfx::Canvas* canvas) { | 1475 void WebContentsViewAura::OnPaint(const ui::PaintContext& context) { |
1476 } | 1476 } |
1477 | 1477 |
1478 void WebContentsViewAura::OnDeviceScaleFactorChanged( | 1478 void WebContentsViewAura::OnDeviceScaleFactorChanged( |
1479 float device_scale_factor) { | 1479 float device_scale_factor) { |
1480 } | 1480 } |
1481 | 1481 |
1482 void WebContentsViewAura::OnWindowDestroying(aura::Window* window) { | 1482 void WebContentsViewAura::OnWindowDestroying(aura::Window* window) { |
1483 // This means the destructor is going to be called soon. If there is an | 1483 // This means the destructor is going to be called soon. If there is an |
1484 // overscroll gesture in progress (i.e. |overscroll_window_| is not NULL), | 1484 // overscroll gesture in progress (i.e. |overscroll_window_| is not NULL), |
1485 // then destroying it in the WebContentsViewAura destructor can trigger other | 1485 // then destroying it in the WebContentsViewAura destructor can trigger other |
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1641 if (visible) { | 1641 if (visible) { |
1642 if (!web_contents_->should_normally_be_visible()) | 1642 if (!web_contents_->should_normally_be_visible()) |
1643 web_contents_->WasShown(); | 1643 web_contents_->WasShown(); |
1644 } else { | 1644 } else { |
1645 if (web_contents_->should_normally_be_visible()) | 1645 if (web_contents_->should_normally_be_visible()) |
1646 web_contents_->WasHidden(); | 1646 web_contents_->WasHidden(); |
1647 } | 1647 } |
1648 } | 1648 } |
1649 | 1649 |
1650 } // namespace content | 1650 } // namespace content |
OLD | NEW |