Index: chrome/browser/ui/webui/signin/inline_login_ui.cc |
diff --git a/chrome/browser/ui/webui/signin/inline_login_ui.cc b/chrome/browser/ui/webui/signin/inline_login_ui.cc |
index fe2980a4e3d2032446945810a16b60df3c78bb31..d969af9590f4848d1f41795cf60de0fd2abd9678 100644 |
--- a/chrome/browser/ui/webui/signin/inline_login_ui.cc |
+++ b/chrome/browser/ui/webui/signin/inline_login_ui.cc |
@@ -17,6 +17,7 @@ |
#include "extensions/browser/guest_view/guest_view_manager.h" |
#include "grit/browser_resources.h" |
#if defined(OS_CHROMEOS) |
+#include "chrome/browser/chromeos/login/startup_utils.h" |
#include "chrome/browser/ui/webui/chromeos/login/inline_login_handler_chromeos.h" |
#else |
#include "chrome/browser/ui/webui/signin/inline_login_handler_impl.h" |
@@ -95,7 +96,11 @@ content::RenderFrameHost* InlineLoginUI::GetAuthIframe( |
const GURL& parent_origin, |
const std::string& parent_frame_name) { |
std::set<content::RenderFrameHost*> frame_set; |
- if (switches::IsEnableWebviewBasedSignin()) { |
+ if (switches::IsEnableWebviewBasedSignin() |
+#if defined(OS_CHROMEOS) |
+ || chromeos::StartupUtils::IsWebviewSigninEnabled() |
Dmitry Polukhin
2015/01/29 10:51:15
Could you please instead create boolean variable l
Roman Sorokin (ftl)
2015/01/29 12:06:09
Done.
|
+#endif |
+ ) { |
extensions::GuestViewManager* manager = |
extensions::GuestViewManager::FromBrowserContext( |
web_contents->GetBrowserContext()); |