Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(278)

Side by Side Diff: chrome/browser/infobars/infobar_service.cc

Issue 2225343002: Navigation: move RestoreType and ReloadType into a separate file (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: [rebase] Created 4 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/infobars/infobar_service.h ('k') | chrome/browser/net/net_error_tab_helper.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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/infobars/infobar_service.h" 5 #include "chrome/browser/infobars/infobar_service.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/chrome_notification_types.h" 8 #include "chrome/browser/chrome_notification_types.h"
9 #include "chrome/common/render_messages.h" 9 #include "chrome/common/render_messages.h"
10 #include "components/content_settings/content/common/content_settings_messages.h " 10 #include "components/content_settings/content/common/content_settings_messages.h "
(...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after
84 84
85 // InfoBarService::CreateConfirmInfoBar() is implemented in platform-specific 85 // InfoBarService::CreateConfirmInfoBar() is implemented in platform-specific
86 // files. 86 // files.
87 87
88 void InfoBarService::RenderProcessGone(base::TerminationStatus status) { 88 void InfoBarService::RenderProcessGone(base::TerminationStatus status) {
89 RemoveAllInfoBars(true); 89 RemoveAllInfoBars(true);
90 } 90 }
91 91
92 void InfoBarService::DidStartNavigationToPendingEntry( 92 void InfoBarService::DidStartNavigationToPendingEntry(
93 const GURL& url, 93 const GURL& url,
94 content::NavigationController::ReloadType reload_type) { 94 content::ReloadType reload_type) {
95 ignore_next_reload_ = false; 95 ignore_next_reload_ = false;
96 } 96 }
97 97
98 void InfoBarService::NavigationEntryCommitted( 98 void InfoBarService::NavigationEntryCommitted(
99 const content::LoadCommittedDetails& load_details) { 99 const content::LoadCommittedDetails& load_details) {
100 const bool ignore = ignore_next_reload_ && 100 const bool ignore = ignore_next_reload_ &&
101 ui::PageTransitionCoreTypeIs(load_details.entry->GetTransitionType(), 101 ui::PageTransitionCoreTypeIs(load_details.entry->GetTransitionType(),
102 ui::PAGE_TRANSITION_RELOAD); 102 ui::PAGE_TRANSITION_RELOAD);
103 ignore_next_reload_ = false; 103 ignore_next_reload_ = false;
104 if (!ignore) 104 if (!ignore)
(...skipping 14 matching lines...) Expand all
119 // A normal user click on an infobar URL will result in a CURRENT_TAB 119 // A normal user click on an infobar URL will result in a CURRENT_TAB
120 // disposition; turn that into a NEW_FOREGROUND_TAB so that we don't end up 120 // disposition; turn that into a NEW_FOREGROUND_TAB so that we don't end up
121 // smashing the page the user is looking at. 121 // smashing the page the user is looking at.
122 web_contents()->OpenURL( 122 web_contents()->OpenURL(
123 content::OpenURLParams(url, content::Referrer(), 123 content::OpenURLParams(url, content::Referrer(),
124 (disposition == WindowOpenDisposition::CURRENT_TAB) 124 (disposition == WindowOpenDisposition::CURRENT_TAB)
125 ? WindowOpenDisposition::NEW_FOREGROUND_TAB 125 ? WindowOpenDisposition::NEW_FOREGROUND_TAB
126 : disposition, 126 : disposition,
127 ui::PAGE_TRANSITION_LINK, false)); 127 ui::PAGE_TRANSITION_LINK, false));
128 } 128 }
OLDNEW
« no previous file with comments | « chrome/browser/infobars/infobar_service.h ('k') | chrome/browser/net/net_error_tab_helper.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698