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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 4862 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
4873 window_pref.append(app_name); | 4873 window_pref.append(app_name); |
4874 PrefService* prefs = profile->GetPrefs(); | 4874 PrefService* prefs = profile->GetPrefs(); |
4875 if (!prefs->FindPreference(window_pref.c_str())) { | 4875 if (!prefs->FindPreference(window_pref.c_str())) { |
4876 prefs->RegisterDictionaryPref(window_pref.c_str(), | 4876 prefs->RegisterDictionaryPref(window_pref.c_str(), |
4877 PrefService::UNSYNCABLE_PREF); | 4877 PrefService::UNSYNCABLE_PREF); |
4878 } | 4878 } |
4879 } | 4879 } |
4880 | 4880 |
4881 void Browser::ReloadInternal(WindowOpenDisposition disposition, | 4881 void Browser::ReloadInternal(WindowOpenDisposition disposition, |
4882 bool ignore_cache) { | 4882 bool ignore_cache) { |
4883 if (fullscreen_controller_->HandleUserPressedReload()) | |
4884 return; | |
yzshen1
2012/06/18 16:22:05
Why the following actions are not needed when full
| |
4885 | |
4883 // If we are showing an interstitial, treat this as an OpenURL. | 4886 // If we are showing an interstitial, treat this as an OpenURL. |
4884 WebContents* current_tab = GetActiveWebContents(); | 4887 WebContents* current_tab = GetActiveWebContents(); |
4885 if (current_tab && current_tab->ShowingInterstitialPage()) { | 4888 if (current_tab && current_tab->ShowingInterstitialPage()) { |
4886 NavigationEntry* entry = current_tab->GetController().GetActiveEntry(); | 4889 NavigationEntry* entry = current_tab->GetController().GetActiveEntry(); |
4887 DCHECK(entry); // Should exist if interstitial is showing. | 4890 DCHECK(entry); // Should exist if interstitial is showing. |
4888 OpenURL(OpenURLParams( | 4891 OpenURL(OpenURLParams( |
4889 entry->GetURL(), Referrer(), disposition, | 4892 entry->GetURL(), Referrer(), disposition, |
4890 content::PAGE_TRANSITION_RELOAD, false)); | 4893 content::PAGE_TRANSITION_RELOAD, false)); |
4891 return; | 4894 return; |
4892 } | 4895 } |
(...skipping 337 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5230 if (contents && !allow_js_access) { | 5233 if (contents && !allow_js_access) { |
5231 contents->web_contents()->GetController().LoadURL( | 5234 contents->web_contents()->GetController().LoadURL( |
5232 target_url, | 5235 target_url, |
5233 content::Referrer(), | 5236 content::Referrer(), |
5234 content::PAGE_TRANSITION_LINK, | 5237 content::PAGE_TRANSITION_LINK, |
5235 std::string()); // No extra headers. | 5238 std::string()); // No extra headers. |
5236 } | 5239 } |
5237 | 5240 |
5238 return contents != NULL; | 5241 return contents != NULL; |
5239 } | 5242 } |
OLD | NEW |