| 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_tab_contents.h" | 5 #include "chrome/browser/ui/browser_tab_contents.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/api/web_navigation/web_navigation_api.h" | 10 #include "chrome/browser/extensions/api/web_navigation/web_navigation_api.h" |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 165 printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents); | 165 printing::PrintPreviewMessageHandler::CreateForWebContents(web_contents); |
| 166 printing::PrintViewManager::CreateForWebContents(web_contents); | 166 printing::PrintViewManager::CreateForWebContents(web_contents); |
| 167 #endif | 167 #endif |
| 168 | 168 |
| 169 #if defined(ENABLE_ONE_CLICK_SIGNIN) | 169 #if defined(ENABLE_ONE_CLICK_SIGNIN) |
| 170 // If this is not an incognito window, setup to handle one-click login. | 170 // If this is not an incognito window, setup to handle one-click login. |
| 171 // We don't want to check that the profile is already connected at this time | 171 // We don't want to check that the profile is already connected at this time |
| 172 // because the connected state may change while this tab is open. Having a | 172 // because the connected state may change while this tab is open. Having a |
| 173 // one-click signin helper attached does not cause problems if the profile | 173 // one-click signin helper attached does not cause problems if the profile |
| 174 // happens to be already connected. | 174 // happens to be already connected. |
| 175 if (OneClickSigninHelper::CanOffer( | 175 if (OneClickSigninHelper::CanOffer(web_contents, |
| 176 web_contents, OneClickSigninHelper::CAN_OFFER_FOR_ALL, "", NULL)) { | 176 OneClickSigninHelper::CAN_OFFER_FOR_ALL, |
| 177 std::string(), |
| 178 NULL)) { |
| 177 OneClickSigninHelper::CreateForWebContents(web_contents); | 179 OneClickSigninHelper::CreateForWebContents(web_contents); |
| 178 } | 180 } |
| 179 #endif | 181 #endif |
| 180 | 182 |
| 181 #if defined(OS_WIN) | 183 #if defined(OS_WIN) |
| 182 MetroPinTabHelper::CreateForWebContents(web_contents); | 184 MetroPinTabHelper::CreateForWebContents(web_contents); |
| 183 #endif | 185 #endif |
| 184 } | 186 } |
| OLD | NEW |