| 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 717 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 728 } | 728 } |
| 729 DCHECK(!pending_install_.icon.isNull()) << "Menu item should be disabled."; | 729 DCHECK(!pending_install_.icon.isNull()) << "Menu item should be disabled."; |
| 730 if (pending_install_.title.empty()) | 730 if (pending_install_.title.empty()) |
| 731 pending_install_.title = UTF8ToWide(GetURL().spec()); | 731 pending_install_.title = UTF8ToWide(GetURL().spec()); |
| 732 | 732 |
| 733 // Request the application info. When done OnDidGetApplicationInfo is invoked | 733 // Request the application info. When done OnDidGetApplicationInfo is invoked |
| 734 // and we'll create the shortcut. | 734 // and we'll create the shortcut. |
| 735 render_view_host()->GetApplicationInfo(pending_install_.page_id); | 735 render_view_host()->GetApplicationInfo(pending_install_.page_id); |
| 736 } | 736 } |
| 737 | 737 |
| 738 #if defined(OS_WIN) | 738 #if defined(OS_WIN) || defined(OS_LINUX) |
| 739 ConstrainedWindow* TabContents::CreateConstrainedDialog( | 739 ConstrainedWindow* TabContents::CreateConstrainedDialog( |
| 740 views::WindowDelegate* window_delegate) { | 740 ConstrainedWindowDelegate* delegate) { |
| 741 ConstrainedWindow* window = | 741 ConstrainedWindow* window = |
| 742 ConstrainedWindow::CreateConstrainedDialog( | 742 ConstrainedWindow::CreateConstrainedDialog(this, delegate); |
| 743 this, window_delegate); | |
| 744 child_windows_.push_back(window); | 743 child_windows_.push_back(window); |
| 745 return window; | 744 return window; |
| 746 } | 745 } |
| 747 #endif | 746 #endif |
| 748 | 747 |
| 749 void TabContents::AddNewContents(TabContents* new_contents, | 748 void TabContents::AddNewContents(TabContents* new_contents, |
| 750 WindowOpenDisposition disposition, | 749 WindowOpenDisposition disposition, |
| 751 const gfx::Rect& initial_pos, | 750 const gfx::Rect& initial_pos, |
| 752 bool user_gesture, | 751 bool user_gesture, |
| 753 const GURL& creator_url) { | 752 const GURL& creator_url) { |
| (...skipping 1582 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2336 NavigationController::LoadCommittedDetails& committed_details = | 2335 NavigationController::LoadCommittedDetails& committed_details = |
| 2337 *(Details<NavigationController::LoadCommittedDetails>(details).ptr()); | 2336 *(Details<NavigationController::LoadCommittedDetails>(details).ptr()); |
| 2338 ExpireInfoBars(committed_details); | 2337 ExpireInfoBars(committed_details); |
| 2339 break; | 2338 break; |
| 2340 } | 2339 } |
| 2341 | 2340 |
| 2342 default: | 2341 default: |
| 2343 NOTREACHED(); | 2342 NOTREACHED(); |
| 2344 } | 2343 } |
| 2345 } | 2344 } |
| OLD | NEW |