| OLD | NEW |
| 1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2009 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/tab_contents/tab_contents.h" | 5 #include "chrome/browser/tab_contents/tab_contents.h" |
| 6 | 6 |
| 7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
| 8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
| 9 #include "base/file_version_info.h" | 9 #include "base/file_version_info.h" |
| 10 #include "base/process_util.h" | 10 #include "base/process_util.h" |
| (...skipping 753 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 764 | 764 |
| 765 void TabContents::ShowPageInfo(const GURL& url, | 765 void TabContents::ShowPageInfo(const GURL& url, |
| 766 const NavigationEntry::SSLStatus& ssl, | 766 const NavigationEntry::SSLStatus& ssl, |
| 767 bool show_history) { | 767 bool show_history) { |
| 768 if (!delegate_) | 768 if (!delegate_) |
| 769 return; | 769 return; |
| 770 | 770 |
| 771 delegate_->ShowPageInfo(profile(), url, ssl, show_history); | 771 delegate_->ShowPageInfo(profile(), url, ssl, show_history); |
| 772 } | 772 } |
| 773 | 773 |
| 774 #if defined(OS_WIN) || defined(OS_LINUX) | |
| 775 ConstrainedWindow* TabContents::CreateConstrainedDialog( | 774 ConstrainedWindow* TabContents::CreateConstrainedDialog( |
| 776 ConstrainedWindowDelegate* delegate) { | 775 ConstrainedWindowDelegate* delegate) { |
| 777 ConstrainedWindow* window = | 776 ConstrainedWindow* window = |
| 778 ConstrainedWindow::CreateConstrainedDialog(this, delegate); | 777 ConstrainedWindow::CreateConstrainedDialog(this, delegate); |
| 779 child_windows_.push_back(window); | 778 child_windows_.push_back(window); |
| 780 return window; | 779 return window; |
| 781 } | 780 } |
| 782 #endif | |
| 783 | 781 |
| 784 void TabContents::AddNewContents(TabContents* new_contents, | 782 void TabContents::AddNewContents(TabContents* new_contents, |
| 785 WindowOpenDisposition disposition, | 783 WindowOpenDisposition disposition, |
| 786 const gfx::Rect& initial_pos, | 784 const gfx::Rect& initial_pos, |
| 787 bool user_gesture, | 785 bool user_gesture, |
| 788 const GURL& creator_url) { | 786 const GURL& creator_url) { |
| 789 if (!delegate_) | 787 if (!delegate_) |
| 790 return; | 788 return; |
| 791 | 789 |
| 792 if ((disposition == NEW_POPUP) && !user_gesture && | 790 if ((disposition == NEW_POPUP) && !user_gesture && |
| (...skipping 1610 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2403 NavigationController::LoadCommittedDetails& committed_details = | 2401 NavigationController::LoadCommittedDetails& committed_details = |
| 2404 *(Details<NavigationController::LoadCommittedDetails>(details).ptr()); | 2402 *(Details<NavigationController::LoadCommittedDetails>(details).ptr()); |
| 2405 ExpireInfoBars(committed_details); | 2403 ExpireInfoBars(committed_details); |
| 2406 break; | 2404 break; |
| 2407 } | 2405 } |
| 2408 | 2406 |
| 2409 default: | 2407 default: |
| 2410 NOTREACHED(); | 2408 NOTREACHED(); |
| 2411 } | 2409 } |
| 2412 } | 2410 } |
| OLD | NEW |