| 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 "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" | 5 #include "chrome/browser/ui/views/tab_contents/tab_contents_view_views.h" |
| 6 | 6 |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/time.h" | 9 #include "base/time.h" |
| 10 #include "chrome/browser/ui/constrained_window.h" | 10 #include "chrome/browser/ui/constrained_window.h" |
| (...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 49 TabContentsViewViews::~TabContentsViewViews() { | 49 TabContentsViewViews::~TabContentsViewViews() { |
| 50 // Makes sure to remove any stored view we may still have in the ViewStorage. | 50 // Makes sure to remove any stored view we may still have in the ViewStorage. |
| 51 // | 51 // |
| 52 // It is possible the view went away before us, so we only do this if the | 52 // It is possible the view went away before us, so we only do this if the |
| 53 // view is registered. | 53 // view is registered. |
| 54 views::ViewStorage* view_storage = views::ViewStorage::GetInstance(); | 54 views::ViewStorage* view_storage = views::ViewStorage::GetInstance(); |
| 55 if (view_storage->RetrieveView(last_focused_view_storage_id_) != NULL) | 55 if (view_storage->RetrieveView(last_focused_view_storage_id_) != NULL) |
| 56 view_storage->RemoveView(last_focused_view_storage_id_); | 56 view_storage->RemoveView(last_focused_view_storage_id_); |
| 57 } | 57 } |
| 58 | 58 |
| 59 void TabContentsViewViews::AttachConstrainedWindow( | |
| 60 ConstrainedWindowGtk* constrained_window) { | |
| 61 } | |
| 62 void TabContentsViewViews::RemoveConstrainedWindow( | |
| 63 ConstrainedWindowGtk* constrained_window) { | |
| 64 } | |
| 65 | |
| 66 void TabContentsViewViews::Unparent() { | 59 void TabContentsViewViews::Unparent() { |
| 67 // Remember who our FocusManager is, we won't be able to access it once | 60 // Remember who our FocusManager is, we won't be able to access it once |
| 68 // un-parented. | 61 // un-parented. |
| 69 focus_manager_ = Widget::GetFocusManager(); | 62 focus_manager_ = Widget::GetFocusManager(); |
| 70 CHECK(native_tab_contents_view_); | 63 CHECK(native_tab_contents_view_); |
| 71 native_tab_contents_view_->Unparent(); | 64 native_tab_contents_view_->Unparent(); |
| 72 } | 65 } |
| 73 | 66 |
| 74 void TabContentsViewViews::CreateView(const gfx::Size& initial_size) { | 67 void TabContentsViewViews::CreateView(const gfx::Size& initial_size) { |
| 75 native_tab_contents_view_ = | 68 native_tab_contents_view_ = |
| (...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 469 web_contents_->HideContents(); | 462 web_contents_->HideContents(); |
| 470 } | 463 } |
| 471 } | 464 } |
| 472 | 465 |
| 473 void TabContentsViewViews::OnNativeWidgetSizeChanged( | 466 void TabContentsViewViews::OnNativeWidgetSizeChanged( |
| 474 const gfx::Size& new_size) { | 467 const gfx::Size& new_size) { |
| 475 if (overlaid_view_) | 468 if (overlaid_view_) |
| 476 overlaid_view_->SetBounds(gfx::Rect(new_size)); | 469 overlaid_view_->SetBounds(gfx::Rect(new_size)); |
| 477 views::Widget::OnNativeWidgetSizeChanged(new_size); | 470 views::Widget::OnNativeWidgetSizeChanged(new_size); |
| 478 } | 471 } |
| OLD | NEW |