| OLD | NEW |
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <shellapi.h> | 8 #include <shellapi.h> |
| 9 #include <windows.h> | 9 #include <windows.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 2873 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2884 | 2884 |
| 2885 void Browser::TabDeselected(TabContentsWrapper* contents) { | 2885 void Browser::TabDeselected(TabContentsWrapper* contents) { |
| 2886 if (instant()) | 2886 if (instant()) |
| 2887 instant()->DestroyPreviewContents(); | 2887 instant()->DestroyPreviewContents(); |
| 2888 | 2888 |
| 2889 // Save what the user's currently typing, so it can be restored when we | 2889 // Save what the user's currently typing, so it can be restored when we |
| 2890 // switch back to this tab. | 2890 // switch back to this tab. |
| 2891 window_->GetLocationBar()->SaveStateToContents(contents->tab_contents()); | 2891 window_->GetLocationBar()->SaveStateToContents(contents->tab_contents()); |
| 2892 } | 2892 } |
| 2893 | 2893 |
| 2894 void Browser::TabSelectedAt(TabContentsWrapper* old_contents, | 2894 void Browser::ActiveTabChanged(TabContentsWrapper* old_contents, |
| 2895 TabContentsWrapper* new_contents, | 2895 TabContentsWrapper* new_contents, |
| 2896 int index, | 2896 int index, |
| 2897 bool user_gesture) { | 2897 bool user_gesture) { |
| 2898 if (old_contents == new_contents) | 2898 if (old_contents == new_contents) |
| 2899 return; | 2899 return; |
| 2900 | 2900 |
| 2901 // On some platforms we want to automatically reload tabs that are | 2901 // On some platforms we want to automatically reload tabs that are |
| 2902 // killed when the user selects them. | 2902 // killed when the user selects them. |
| 2903 if (user_gesture && new_contents->tab_contents()->crashed_status() == | 2903 if (user_gesture && new_contents->tab_contents()->crashed_status() == |
| 2904 base::TERMINATION_STATUS_PROCESS_WAS_KILLED) { | 2904 base::TERMINATION_STATUS_PROCESS_WAS_KILLED) { |
| 2905 const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); | 2905 const CommandLine& parsed_command_line = *CommandLine::ForCurrentProcess(); |
| 2906 if (parsed_command_line.HasSwitch(switches::kReloadKilledTabs)) { | 2906 if (parsed_command_line.HasSwitch(switches::kReloadKilledTabs)) { |
| 2907 Reload(CURRENT_TAB); | 2907 Reload(CURRENT_TAB); |
| (...skipping 1736 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4644 TabContents* current_tab = GetSelectedTabContents(); | 4644 TabContents* current_tab = GetSelectedTabContents(); |
| 4645 if (current_tab) { | 4645 if (current_tab) { |
| 4646 content_restrictions = current_tab->content_restrictions(); | 4646 content_restrictions = current_tab->content_restrictions(); |
| 4647 NavigationEntry* active_entry = current_tab->controller().GetActiveEntry(); | 4647 NavigationEntry* active_entry = current_tab->controller().GetActiveEntry(); |
| 4648 // See comment in UpdateCommandsForTabState about why we call url(). | 4648 // See comment in UpdateCommandsForTabState about why we call url(). |
| 4649 if (!SavePackage::IsSavableURL(active_entry ? active_entry->url() : GURL())) | 4649 if (!SavePackage::IsSavableURL(active_entry ? active_entry->url() : GURL())) |
| 4650 content_restrictions |= CONTENT_RESTRICTION_SAVE; | 4650 content_restrictions |= CONTENT_RESTRICTION_SAVE; |
| 4651 } | 4651 } |
| 4652 return content_restrictions; | 4652 return content_restrictions; |
| 4653 } | 4653 } |
| OLD | NEW |