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

Side by Side Diff: chrome/browser/ui/webui/signin/inline_login_handler.cc

Issue 1136693002: Chrome user menu shouldn't close if a tab steals focus (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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
OLDNEW
1 // Copyright 2013 The Chromium Authors. All rights reserved. 1 // Copyright 2013 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/webui/signin/inline_login_handler.h" 5 #include "chrome/browser/ui/webui/signin/inline_login_handler.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/prefs/pref_service.h" 8 #include "base/prefs/pref_service.h"
9 #include "base/strings/string_number_conversions.h" 9 #include "base/strings/string_number_conversions.h"
10 #include "base/strings/utf_string_conversions.h" 10 #include "base/strings/utf_string_conversions.h"
11 #include "base/values.h" 11 #include "base/values.h"
12 #include "chrome/browser/browser_process.h" 12 #include "chrome/browser/browser_process.h"
13 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h" 13 #include "chrome/browser/extensions/signin/gaia_auth_extension_loader.h"
14 #include "chrome/browser/profiles/profile.h" 14 #include "chrome/browser/profiles/profile.h"
15 #include "chrome/browser/signin/signin_promo.h" 15 #include "chrome/browser/signin/signin_promo.h"
16 #include "chrome/browser/ui/browser_navigator.h" 16 #include "chrome/browser/ui/browser_navigator.h"
17 #include "chrome/common/pref_names.h" 17 #include "chrome/common/pref_names.h"
18 #include "components/signin/core/common/profile_management_switches.h"
18 #include "content/public/browser/web_contents.h" 19 #include "content/public/browser/web_contents.h"
19 #include "content/public/browser/web_ui.h" 20 #include "content/public/browser/web_ui.h"
20 #include "google_apis/gaia/gaia_urls.h" 21 #include "google_apis/gaia/gaia_urls.h"
21 #include "net/base/url_util.h" 22 #include "net/base/url_util.h"
23 #include "ui/aura/window.h"
22 24
23 InlineLoginHandler::InlineLoginHandler() {} 25 InlineLoginHandler::InlineLoginHandler() {}
24 26
25 InlineLoginHandler::~InlineLoginHandler() {} 27 InlineLoginHandler::~InlineLoginHandler() {}
26 28
27 void InlineLoginHandler::RegisterMessages() { 29 void InlineLoginHandler::RegisterMessages() {
28 web_ui()->RegisterMessageCallback("initialize", 30 web_ui()->RegisterMessageCallback("initialize",
29 base::Bind(&InlineLoginHandler::HandleInitializeMessage, 31 base::Bind(&InlineLoginHandler::HandleInitializeMessage,
30 base::Unretained(this))); 32 base::Unretained(this)));
31 web_ui()->RegisterMessageCallback("completeLogin", 33 web_ui()->RegisterMessageCallback("completeLogin",
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
129 main_frame_url = net::AppendOrReplaceQueryParameter( 131 main_frame_url = net::AppendOrReplaceQueryParameter(
130 main_frame_url, signin::kSignInPromoQueryKeyShowAccountManagement, "1"); 132 main_frame_url, signin::kSignInPromoQueryKeyShowAccountManagement, "1");
131 133
132 chrome::NavigateParams params( 134 chrome::NavigateParams params(
133 profile, 135 profile,
134 net::AppendOrReplaceQueryParameter( 136 net::AppendOrReplaceQueryParameter(
135 main_frame_url, signin::kSignInPromoQueryKeyConstrained, "0"), 137 main_frame_url, signin::kSignInPromoQueryKeyConstrained, "0"),
136 ui::PAGE_TRANSITION_AUTO_TOPLEVEL); 138 ui::PAGE_TRANSITION_AUTO_TOPLEVEL);
137 chrome::Navigate(&params); 139 chrome::Navigate(&params);
138 140
141 if (signin::GetSourceForPromoURL(main_frame_url) ==
142 signin_metrics::SOURCE_AVATAR_BUBBLE_SIGN_IN) {
143 gfx::NativeWindow top_level_window_ =
144 web_ui()->GetWebContents()->GetTopLevelNativeWindow();
145 if (top_level_window_ != nullptr)
146 top_level_window_->Hide();
147 }
Roger Tawa OOO till Jul 10th 2015/05/08 14:51:17 I guess you can' call ProfileChooserView::Hide() d
148
139 web_ui()->CallJavascriptFunction("inline.login.closeDialog"); 149 web_ui()->CallJavascriptFunction("inline.login.closeDialog");
140 } 150 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698