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/file_util.h" | 9 #include "base/file_util.h" |
10 #include "base/metrics/histogram.h" | 10 #include "base/metrics/histogram.h" |
(...skipping 1388 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1399 aura::client::kConstrainedWindowKey)) { | 1399 aura::client::kConstrainedWindowKey)) { |
1400 gfx::Rect bounds = window_->children()[i]->bounds(); | 1400 gfx::Rect bounds = window_->children()[i]->bounds(); |
1401 bounds.set_origin( | 1401 bounds.set_origin( |
1402 gfx::Point((new_bounds.width() - bounds.width()) / 2, | 1402 gfx::Point((new_bounds.width() - bounds.width()) / 2, |
1403 (new_bounds.height() - bounds.height()) / 2)); | 1403 (new_bounds.height() - bounds.height()) / 2)); |
1404 window_->children()[i]->SetBounds(bounds); | 1404 window_->children()[i]->SetBounds(bounds); |
1405 } | 1405 } |
1406 } | 1406 } |
1407 } | 1407 } |
1408 | 1408 |
| 1409 void WebContentsViewAura::OnPropertyChanged(const void* key, intptr_t old) { |
| 1410 } |
| 1411 |
1409 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) { | 1412 gfx::NativeCursor WebContentsViewAura::GetCursor(const gfx::Point& point) { |
1410 return gfx::kNullCursor; | 1413 return gfx::kNullCursor; |
1411 } | 1414 } |
1412 | 1415 |
1413 int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const { | 1416 int WebContentsViewAura::GetNonClientComponent(const gfx::Point& point) const { |
1414 return HTCLIENT; | 1417 return HTCLIENT; |
1415 } | 1418 } |
1416 | 1419 |
1417 bool WebContentsViewAura::ShouldDescendIntoChildForEventHandling( | 1420 bool WebContentsViewAura::ShouldDescendIntoChildForEventHandling( |
1418 aura::Window* child, | 1421 aura::Window* child, |
(...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1617 if (visible) { | 1620 if (visible) { |
1618 if (!web_contents_->should_normally_be_visible()) | 1621 if (!web_contents_->should_normally_be_visible()) |
1619 web_contents_->WasShown(); | 1622 web_contents_->WasShown(); |
1620 } else { | 1623 } else { |
1621 if (web_contents_->should_normally_be_visible()) | 1624 if (web_contents_->should_normally_be_visible()) |
1622 web_contents_->WasHidden(); | 1625 web_contents_->WasHidden(); |
1623 } | 1626 } |
1624 } | 1627 } |
1625 | 1628 |
1626 } // namespace content | 1629 } // namespace content |
OLD | NEW |