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

Side by Side Diff: chrome/browser/ui/tab_helpers.cc

Issue 242483003: Move CaptivePortalDetector to src/components/captive_portal (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase Created 6 years, 7 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 | Annotate | Revision Log
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/chrome_browser.gypi » ('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 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 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/tab_helpers.h" 5 #include "chrome/browser/ui/tab_helpers.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/browser_process.h" 8 #include "chrome/browser/browser_process.h"
9 #include "chrome/browser/content_settings/tab_specific_content_settings.h" 9 #include "chrome/browser/content_settings/tab_specific_content_settings.h"
10 #include "chrome/browser/extensions/tab_helper.h" 10 #include "chrome/browser/extensions/tab_helper.h"
(...skipping 158 matching lines...) Expand 10 before | Expand all | Expand 10 after
169 ZoomController::CreateForWebContents(web_contents); 169 ZoomController::CreateForWebContents(web_contents);
170 #endif 170 #endif
171 171
172 #if defined(OS_WIN) 172 #if defined(OS_WIN)
173 MetroPinTabHelper::CreateForWebContents(web_contents); 173 MetroPinTabHelper::CreateForWebContents(web_contents);
174 #endif 174 #endif
175 175
176 // --- Feature tab helpers behind flags --- 176 // --- Feature tab helpers behind flags ---
177 177
178 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 178 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
179 captive_portal::CaptivePortalTabHelper::CreateForWebContents(web_contents); 179 CaptivePortalTabHelper::CreateForWebContents(web_contents);
180 #endif 180 #endif
181 181
182 #if defined(ENABLE_MANAGED_USERS) 182 #if defined(ENABLE_MANAGED_USERS)
183 Profile* profile = 183 Profile* profile =
184 Profile::FromBrowserContext(web_contents->GetBrowserContext()); 184 Profile::FromBrowserContext(web_contents->GetBrowserContext());
185 if (profile->IsManaged()) { 185 if (profile->IsManaged()) {
186 ManagedModeNavigationObserver::CreateForWebContents(web_contents); 186 ManagedModeNavigationObserver::CreateForWebContents(web_contents);
187 } 187 }
188 #endif 188 #endif
189 189
(...skipping 15 matching lines...) Expand all
205 if (OneClickSigninHelper::CanOffer(web_contents, 205 if (OneClickSigninHelper::CanOffer(web_contents,
206 OneClickSigninHelper::CAN_OFFER_FOR_ALL, 206 OneClickSigninHelper::CAN_OFFER_FOR_ALL,
207 std::string(), 207 std::string(),
208 NULL)) { 208 NULL)) {
209 OneClickSigninHelper::CreateForWebContentsWithPasswordManager( 209 OneClickSigninHelper::CreateForWebContentsWithPasswordManager(
210 web_contents, 210 web_contents,
211 ChromePasswordManagerClient::GetManagerFromWebContents(web_contents)); 211 ChromePasswordManagerClient::GetManagerFromWebContents(web_contents));
212 } 212 }
213 #endif 213 #endif
214 } 214 }
OLDNEW
« no previous file with comments | « chrome/browser/ssl/ssl_blocking_page.cc ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698