| OLD | NEW |
| 1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/ui/views/frame/contents_layout_manager.h" | 5 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" |
| 6 | 6 |
| 7 #include "ui/views/view.h" | 7 #include "ui/views/view.h" |
| 8 | 8 |
| 9 ContentsLayoutManager::ContentsLayoutManager( | 9 ContentsLayoutManager::ContentsLayoutManager( |
| 10 views::View* devtools_view, | 10 views::View* devtools_view, |
| (...skipping 27 matching lines...) Expand all Loading... |
| 38 } | 38 } |
| 39 | 39 |
| 40 void ContentsLayoutManager::Layout(views::View* contents_container) { | 40 void ContentsLayoutManager::Layout(views::View* contents_container) { |
| 41 DCHECK(host_ == contents_container); | 41 DCHECK(host_ == contents_container); |
| 42 | 42 |
| 43 int top = active_top_margin_; | 43 int top = active_top_margin_; |
| 44 int height = std::max(0, contents_container->height() - top); | 44 int height = std::max(0, contents_container->height() - top); |
| 45 int width = contents_container->width(); | 45 int width = contents_container->width(); |
| 46 | 46 |
| 47 gfx::Size container_size(width, height); | 47 gfx::Size container_size(width, height); |
| 48 gfx::Rect old_devtools_bounds(devtools_view_->bounds()); | |
| 49 gfx::Rect old_contents_bounds(contents_view_->bounds()); | |
| 50 gfx::Rect new_devtools_bounds; | 48 gfx::Rect new_devtools_bounds; |
| 51 gfx::Rect new_contents_bounds; | 49 gfx::Rect new_contents_bounds; |
| 52 | 50 |
| 53 old_devtools_bounds.Offset(0, -top); | |
| 54 old_contents_bounds.Offset(0, -top); | |
| 55 ApplyDevToolsContentsResizingStrategy(strategy_, container_size, | 51 ApplyDevToolsContentsResizingStrategy(strategy_, container_size, |
| 56 old_devtools_bounds, old_contents_bounds, | |
| 57 &new_devtools_bounds, &new_contents_bounds); | 52 &new_devtools_bounds, &new_contents_bounds); |
| 58 new_devtools_bounds.Offset(0, top); | 53 new_devtools_bounds.Offset(0, top); |
| 59 new_contents_bounds.Offset(0, top); | 54 new_contents_bounds.Offset(0, top); |
| 60 | 55 |
| 61 // DevTools cares about the specific position, so we have to compensate RTL | 56 // DevTools cares about the specific position, so we have to compensate RTL |
| 62 // layout here. | 57 // layout here. |
| 63 new_devtools_bounds.set_x(host_->GetMirroredXForRect(new_devtools_bounds)); | 58 new_devtools_bounds.set_x(host_->GetMirroredXForRect(new_devtools_bounds)); |
| 64 new_contents_bounds.set_x(host_->GetMirroredXForRect(new_contents_bounds)); | 59 new_contents_bounds.set_x(host_->GetMirroredXForRect(new_contents_bounds)); |
| 65 | 60 |
| 66 devtools_view_->SetBoundsRect(new_devtools_bounds); | 61 devtools_view_->SetBoundsRect(new_devtools_bounds); |
| 67 contents_view_->SetBoundsRect(new_contents_bounds); | 62 contents_view_->SetBoundsRect(new_contents_bounds); |
| 68 } | 63 } |
| 69 | 64 |
| 70 gfx::Size ContentsLayoutManager::GetPreferredSize( | 65 gfx::Size ContentsLayoutManager::GetPreferredSize( |
| 71 const views::View* host) const { | 66 const views::View* host) const { |
| 72 return gfx::Size(); | 67 return gfx::Size(); |
| 73 } | 68 } |
| 74 | 69 |
| 75 void ContentsLayoutManager::Installed(views::View* host) { | 70 void ContentsLayoutManager::Installed(views::View* host) { |
| 76 DCHECK(!host_); | 71 DCHECK(!host_); |
| 77 host_ = host; | 72 host_ = host; |
| 78 } | 73 } |
| 79 | 74 |
| 80 void ContentsLayoutManager::Uninstalled(views::View* host) { | 75 void ContentsLayoutManager::Uninstalled(views::View* host) { |
| 81 DCHECK(host_ == host); | 76 DCHECK(host_ == host); |
| 82 host_ = NULL; | 77 host_ = NULL; |
| 83 } | 78 } |
| OLD | NEW |