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

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: Move CaptivePortalStatus back Created 6 years, 8 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
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 156 matching lines...) Expand 10 before | Expand all | Expand 10 after
167 ZoomController::CreateForWebContents(web_contents); 167 ZoomController::CreateForWebContents(web_contents);
168 #endif 168 #endif
169 169
170 #if defined(OS_WIN) 170 #if defined(OS_WIN)
171 MetroPinTabHelper::CreateForWebContents(web_contents); 171 MetroPinTabHelper::CreateForWebContents(web_contents);
172 #endif 172 #endif
173 173
174 // --- Feature tab helpers behind flags --- 174 // --- Feature tab helpers behind flags ---
175 175
176 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION) 176 #if defined(ENABLE_CAPTIVE_PORTAL_DETECTION)
177 captive_portal::CaptivePortalTabHelper::CreateForWebContents(web_contents); 177 CaptivePortalTabHelper::CreateForWebContents(web_contents);
178 #endif 178 #endif
179 179
180 #if defined(ENABLE_MANAGED_USERS) 180 #if defined(ENABLE_MANAGED_USERS)
181 Profile* profile = 181 Profile* profile =
182 Profile::FromBrowserContext(web_contents->GetBrowserContext()); 182 Profile::FromBrowserContext(web_contents->GetBrowserContext());
183 if (profile->IsManaged()) { 183 if (profile->IsManaged()) {
184 ManagedModeNavigationObserver::CreateForWebContents(web_contents); 184 ManagedModeNavigationObserver::CreateForWebContents(web_contents);
185 } 185 }
186 #endif 186 #endif
187 187
(...skipping 15 matching lines...) Expand all
203 if (OneClickSigninHelper::CanOffer(web_contents, 203 if (OneClickSigninHelper::CanOffer(web_contents,
204 OneClickSigninHelper::CAN_OFFER_FOR_ALL, 204 OneClickSigninHelper::CAN_OFFER_FOR_ALL,
205 std::string(), 205 std::string(),
206 NULL)) { 206 NULL)) {
207 OneClickSigninHelper::CreateForWebContentsWithPasswordManager( 207 OneClickSigninHelper::CreateForWebContentsWithPasswordManager(
208 web_contents, 208 web_contents,
209 ChromePasswordManagerClient::GetManagerFromWebContents(web_contents)); 209 ChromePasswordManagerClient::GetManagerFromWebContents(web_contents));
210 } 210 }
211 #endif 211 #endif
212 } 212 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698