OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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 "chrome/browser/ui/views/frame/browser_view_layout.h" | 5 #include "chrome/browser/ui/views/frame/browser_view_layout.h" |
6 | 6 |
7 #include "base/observer_list.h" | 7 #include "base/observer_list.h" |
8 #include "chrome/browser/profiles/profile.h" | 8 #include "chrome/browser/profiles/profile.h" |
9 #include "chrome/browser/ui/browser.h" | 9 #include "chrome/browser/ui/browser.h" |
10 #include "chrome/browser/ui/browser_finder.h" | 10 #include "chrome/browser/ui/browser_finder.h" |
11 #include "chrome/browser/ui/browser_window.h" | 11 #include "chrome/browser/ui/browser_window.h" |
12 #include "chrome/browser/ui/find_bar/find_bar.h" | 12 #include "chrome/browser/ui/find_bar/find_bar.h" |
13 #include "chrome/browser/ui/find_bar/find_bar_controller.h" | 13 #include "chrome/browser/ui/find_bar/find_bar_controller.h" |
14 #include "chrome/browser/ui/search/search_model.h" | 14 #include "chrome/browser/ui/search/search_model.h" |
| 15 #include "chrome/browser/ui/view_ids.h" |
15 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" | 16 #include "chrome/browser/ui/views/bookmarks/bookmark_bar_view.h" |
16 #include "chrome/browser/ui/views/download/download_shelf_view.h" | 17 #include "chrome/browser/ui/views/download/download_shelf_view.h" |
17 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" | 18 #include "chrome/browser/ui/views/exclusive_access_bubble_views.h" |
18 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" | 19 #include "chrome/browser/ui/views/frame/browser_view_layout_delegate.h" |
19 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" | 20 #include "chrome/browser/ui/views/frame/contents_layout_manager.h" |
20 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" | 21 #include "chrome/browser/ui/views/frame/immersive_mode_controller.h" |
21 #include "chrome/browser/ui/views/frame/top_container_view.h" | 22 #include "chrome/browser/ui/views/frame/top_container_view.h" |
22 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" | 23 #include "chrome/browser/ui/views/infobars/infobar_container_view.h" |
23 #include "chrome/browser/ui/views/tabs/tab_strip.h" | 24 #include "chrome/browser/ui/views/tabs/tab_strip.h" |
24 #include "components/web_modal/web_contents_modal_dialog_host.h" | 25 #include "components/web_modal/web_contents_modal_dialog_host.h" |
25 #include "ui/base/hit_test.h" | 26 #include "ui/base/hit_test.h" |
26 #include "ui/gfx/geometry/point.h" | 27 #include "ui/gfx/geometry/point.h" |
27 #include "ui/gfx/geometry/size.h" | 28 #include "ui/gfx/geometry/size.h" |
28 #include "ui/gfx/scrollbar_size.h" | 29 #include "ui/gfx/scrollbar_size.h" |
| 30 #include "ui/views/controls/single_split_view.h" |
29 #include "ui/views/controls/webview/webview.h" | 31 #include "ui/views/controls/webview/webview.h" |
30 #include "ui/views/widget/widget.h" | 32 #include "ui/views/widget/widget.h" |
31 #include "ui/views/window/client_view.h" | 33 #include "ui/views/window/client_view.h" |
32 | 34 |
33 using views::View; | 35 using views::View; |
34 using web_modal::WebContentsModalDialogHost; | 36 using web_modal::WebContentsModalDialogHost; |
35 using web_modal::ModalDialogHostObserver; | 37 using web_modal::ModalDialogHostObserver; |
36 | 38 |
37 namespace { | 39 namespace { |
38 | 40 |
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
359 if (exclusive_access_bubble) | 361 if (exclusive_access_bubble) |
360 exclusive_access_bubble->RepositionIfVisible(); | 362 exclusive_access_bubble->RepositionIfVisible(); |
361 | 363 |
362 // Adjust any hosted dialogs if the browser's dialog hosting bounds changed. | 364 // Adjust any hosted dialogs if the browser's dialog hosting bounds changed. |
363 const gfx::Rect dialog_bounds(dialog_host_->GetDialogPosition(gfx::Size()), | 365 const gfx::Rect dialog_bounds(dialog_host_->GetDialogPosition(gfx::Size()), |
364 dialog_host_->GetMaximumDialogSize()); | 366 dialog_host_->GetMaximumDialogSize()); |
365 if (latest_dialog_bounds_ != dialog_bounds) { | 367 if (latest_dialog_bounds_ != dialog_bounds) { |
366 latest_dialog_bounds_ = dialog_bounds; | 368 latest_dialog_bounds_ = dialog_bounds; |
367 dialog_host_->NotifyPositionRequiresUpdate(); | 369 dialog_host_->NotifyPositionRequiresUpdate(); |
368 } | 370 } |
| 371 |
| 372 views::SingleSplitView* ssplitview = |
| 373 (views::SingleSplitView*)contents_container_; |
| 374 views::View* sidebar_web_view = |
| 375 browser_view_->GetViewByID(VIEW_ID_SIDE_BAR_VIEW); |
| 376 if (ssplitview && sidebar_web_view && sidebar_web_view->visible()) { |
| 377 int width = (contents_container_->width() - ssplitview->divider_offset()); |
| 378 sidebar_web_view->SetBoundsRect( |
| 379 gfx::Rect(0, 0, width, contents_container_->height())); |
| 380 } |
369 } | 381 } |
370 | 382 |
371 // Return the preferred size which is the size required to give each | 383 // Return the preferred size which is the size required to give each |
372 // children their respective preferred size. | 384 // children their respective preferred size. |
373 gfx::Size BrowserViewLayout::GetPreferredSize(const views::View* host) const { | 385 gfx::Size BrowserViewLayout::GetPreferredSize(const views::View* host) const { |
374 return gfx::Size(); | 386 return gfx::Size(); |
375 } | 387 } |
376 | 388 |
377 ////////////////////////////////////////////////////////////////////////////// | 389 ////////////////////////////////////////////////////////////////////////////// |
378 // BrowserViewLayout, private: | 390 // BrowserViewLayout, private: |
(...skipping 161 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
540 return bottom; | 552 return bottom; |
541 } | 553 } |
542 | 554 |
543 bool BrowserViewLayout::InfobarVisible() const { | 555 bool BrowserViewLayout::InfobarVisible() const { |
544 // Cast to a views::View to access GetPreferredSize(). | 556 // Cast to a views::View to access GetPreferredSize(). |
545 views::View* infobar_container = infobar_container_; | 557 views::View* infobar_container = infobar_container_; |
546 // NOTE: Can't check if the size IsEmpty() since it's always 0-width. | 558 // NOTE: Can't check if the size IsEmpty() since it's always 0-width. |
547 return browser_->SupportsWindowFeature(Browser::FEATURE_INFOBAR) && | 559 return browser_->SupportsWindowFeature(Browser::FEATURE_INFOBAR) && |
548 (infobar_container->GetPreferredSize().height() != 0); | 560 (infobar_container->GetPreferredSize().height() != 0); |
549 } | 561 } |
OLD | NEW |