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

Unified Diff: chrome/browser/ui/webui/signin/inline_login_ui.cc

Issue 882353002: Fixed crash when looking for iframe when gaia is being hosted in webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Make it builds w/o chromeos flag Created 5 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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());
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698