| OLD | NEW |
| 1 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2006-2008 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/views/constrained_window_impl.h" | 5 #include "chrome/browser/views/constrained_window_impl.h" |
| 6 | 6 |
| 7 #include "base/gfx/rect.h" | 7 #include "base/gfx/rect.h" |
| 8 #include "chrome/app/chrome_dll_resource.h" | 8 #include "chrome/app/chrome_dll_resource.h" |
| 9 #include "chrome/app/theme/theme_resources.h" | 9 #include "chrome/app/theme/theme_resources.h" |
| 10 #include "chrome/browser/tab_contents.h" | 10 #include "chrome/browser/tab_contents.h" |
| (...skipping 960 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 971 // Ask the delegate's (which is a TabContents) own TabContentsDelegate to | 971 // Ask the delegate's (which is a TabContents) own TabContentsDelegate to |
| 972 // activate itself... | 972 // activate itself... |
| 973 owner_->delegate()->ActivateContents(owner_); | 973 owner_->delegate()->ActivateContents(owner_); |
| 974 | 974 |
| 975 // Set as the foreground constrained window. | 975 // Set as the foreground constrained window. |
| 976 ActivateConstrainedWindow(); | 976 ActivateConstrainedWindow(); |
| 977 } | 977 } |
| 978 | 978 |
| 979 void ConstrainedWindowImpl::OpenURLFromTab(TabContents* source, | 979 void ConstrainedWindowImpl::OpenURLFromTab(TabContents* source, |
| 980 const GURL& url, | 980 const GURL& url, |
| 981 const GURL& referrer, |
| 981 WindowOpenDisposition disposition, | 982 WindowOpenDisposition disposition, |
| 982 PageTransition::Type transition) { | 983 PageTransition::Type transition) { |
| 983 // We ignore source right now. | 984 // We ignore source right now. |
| 984 owner_->OpenURL(this, url, disposition, transition); | 985 owner_->OpenURL(this, url, referrer, disposition, transition); |
| 985 } | 986 } |
| 986 | 987 |
| 987 void ConstrainedWindowImpl::LoadingStateChanged(TabContents* source) { | 988 void ConstrainedWindowImpl::LoadingStateChanged(TabContents* source) { |
| 988 // TODO(beng): (http://b/1085543) Implement a throbber for the Constrained | 989 // TODO(beng): (http://b/1085543) Implement a throbber for the Constrained |
| 989 // Window. | 990 // Window. |
| 990 UpdateUI(TabContents::INVALIDATE_EVERYTHING); | 991 UpdateUI(TabContents::INVALIDATE_EVERYTHING); |
| 991 non_client_view()->SetShowThrobber(source->is_loading()); | 992 non_client_view()->SetShowThrobber(source->is_loading()); |
| 992 } | 993 } |
| 993 | 994 |
| 994 void ConstrainedWindowImpl::NavigateToPage(TabContents* source, | 995 void ConstrainedWindowImpl::NavigateToPage(TabContents* source, |
| (...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1381 initial_bounds, | 1382 initial_bounds, |
| 1382 parent->delegate()->ShouldDisplayURLField()); | 1383 parent->delegate()->ShouldDisplayURLField()); |
| 1383 | 1384 |
| 1384 window->InitSizeForContents(window_bounds); | 1385 window->InitSizeForContents(window_bounds); |
| 1385 | 1386 |
| 1386 // This is a constrained popup window and thus we need to animate it in. | 1387 // This is a constrained popup window and thus we need to animate it in. |
| 1387 window->StartSuppressedAnimation(); | 1388 window->StartSuppressedAnimation(); |
| 1388 | 1389 |
| 1389 return window; | 1390 return window; |
| 1390 } | 1391 } |
| OLD | NEW |