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

Side by Side Diff: chrome/browser/interstitials/chrome_controller_client.cc

Issue 2248873002: Convert WindowOpenDisposition to an enum class. (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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/interstitials/chrome_controller_client.h" 5 #include "chrome/browser/interstitials/chrome_controller_client.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "base/files/file_util.h" 9 #include "base/files/file_util.h"
10 #include "base/process/launch.h" 10 #include "base/process/launch.h"
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
157 157
158 void ChromeControllerClient::Proceed() { 158 void ChromeControllerClient::Proceed() {
159 interstitial_page_->Proceed(); 159 interstitial_page_->Proceed();
160 } 160 }
161 161
162 void ChromeControllerClient::Reload() { 162 void ChromeControllerClient::Reload() {
163 web_contents_->GetController().Reload(true); 163 web_contents_->GetController().Reload(true);
164 } 164 }
165 165
166 void ChromeControllerClient::OpenUrlInCurrentTab(const GURL& url) { 166 void ChromeControllerClient::OpenUrlInCurrentTab(const GURL& url) {
167 content::OpenURLParams params(url, Referrer(), CURRENT_TAB, 167 content::OpenURLParams params(url, Referrer(),
168 WindowOpenDisposition::CURRENT_TAB,
168 ui::PAGE_TRANSITION_LINK, false); 169 ui::PAGE_TRANSITION_LINK, false);
169 web_contents_->OpenURL(params); 170 web_contents_->OpenURL(params);
170 } 171 }
171 172
172 const std::string& ChromeControllerClient::GetApplicationLocale() { 173 const std::string& ChromeControllerClient::GetApplicationLocale() {
173 return g_browser_process->GetApplicationLocale(); 174 return g_browser_process->GetApplicationLocale();
174 } 175 }
175 176
176 PrefService* ChromeControllerClient::GetPrefService() { 177 PrefService* ChromeControllerClient::GetPrefService() {
177 Profile* profile = 178 Profile* profile =
178 Profile::FromBrowserContext(web_contents_->GetBrowserContext()); 179 Profile::FromBrowserContext(web_contents_->GetBrowserContext());
179 return profile->GetPrefs(); 180 return profile->GetPrefs();
180 } 181 }
181 182
182 const std::string ChromeControllerClient::GetExtendedReportingPrefName() { 183 const std::string ChromeControllerClient::GetExtendedReportingPrefName() {
183 return prefs::kSafeBrowsingExtendedReportingEnabled; 184 return prefs::kSafeBrowsingExtendedReportingEnabled;
184 } 185 }
OLDNEW
« no previous file with comments | « chrome/browser/infobars/infobars_browsertest.cc ('k') | chrome/browser/lifetime/browser_close_manager_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698