projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 7.36.149.0
[platform/framework/web/crosswalk.git]
/
src
/
chrome
/
browser
/
extensions
/
api
/
identity
/
web_auth_flow.cc
diff --git
a/src/chrome/browser/extensions/api/identity/web_auth_flow.cc
b/src/chrome/browser/extensions/api/identity/web_auth_flow.cc
index
8235a03
..
2a88e48
100644
(file)
--- a/
src/chrome/browser/extensions/api/identity/web_auth_flow.cc
+++ b/
src/chrome/browser/extensions/api/identity/web_auth_flow.cc
@@
-110,7
+110,7
@@
void WebAuthFlow::DetachDelegateAndDelete() {
void WebAuthFlow::OnAppWindowAdded(AppWindow* app_window) {
if (app_window->window_key() == app_window_key_ &&
void WebAuthFlow::OnAppWindowAdded(AppWindow* app_window) {
if (app_window->window_key() == app_window_key_ &&
- app_window->extension
()->
id() == extension_misc::kIdentityApiUiAppId) {
+ app_window->extension
_
id() == extension_misc::kIdentityApiUiAppId) {
app_window_ = app_window;
WebContentsObserver::Observe(app_window->web_contents());
app_window_ = app_window;
WebContentsObserver::Observe(app_window->web_contents());
@@
-121,11
+121,9
@@
void WebAuthFlow::OnAppWindowAdded(AppWindow* app_window) {
}
}
}
}
-void WebAuthFlow::OnAppWindowIconChanged(AppWindow* app_window) {}
-
void WebAuthFlow::OnAppWindowRemoved(AppWindow* app_window) {
if (app_window->window_key() == app_window_key_ &&
void WebAuthFlow::OnAppWindowRemoved(AppWindow* app_window) {
if (app_window->window_key() == app_window_key_ &&
- app_window->extension
()->
id() == extension_misc::kIdentityApiUiAppId) {
+ app_window->extension
_
id() == extension_misc::kIdentityApiUiAppId) {
app_window_ = NULL;
registrar_.RemoveAll();
app_window_ = NULL;
registrar_.RemoveAll();