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

Unified Diff: chrome/browser/extensions/api/identity/web_auth_flow.cc

Issue 16702003: Move ShellWindow into apps component. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: yar Created 7 years, 6 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
Index: chrome/browser/extensions/api/identity/web_auth_flow.cc
diff --git a/chrome/browser/extensions/api/identity/web_auth_flow.cc b/chrome/browser/extensions/api/identity/web_auth_flow.cc
index 84fa56b595b7fd90004fd901899dd5d427b8c14e..4a8f2adfc8576418fd32ae59bec0238563e33675 100644
--- a/chrome/browser/extensions/api/identity/web_auth_flow.cc
+++ b/chrome/browser/extensions/api/identity/web_auth_flow.cc
@@ -4,6 +4,7 @@
#include "chrome/browser/extensions/api/identity/web_auth_flow.h"
+#include "apps/shell_window.h"
#include "base/base64.h"
#include "base/location.h"
#include "base/message_loop.h"
@@ -15,7 +16,6 @@
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/extensions/extension_system.h"
#include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/ui/extensions/shell_window.h"
#include "chrome/common/extensions/extension_constants.h"
#include "content/public/browser/navigation_details.h"
#include "content/public/browser/navigation_entry.h"
@@ -30,6 +30,7 @@
#include "googleurl/src/gurl.h"
#include "grit/browser_resources.h"
+using apps::ShellWindow;
using content::RenderViewHost;
using content::ResourceRedirectDetails;
using content::WebContents;
@@ -124,6 +125,8 @@ void WebAuthFlow::OnShellWindowAdded(ShellWindow* shell_window) {
}
}
+void WebAuthFlow::OnShellWindowIconChanged(ShellWindow* shell_window) {}
+
void WebAuthFlow::OnShellWindowRemoved(ShellWindow* shell_window) {
if (shell_window->window_key() == shell_window_key_ &&
shell_window->extension()->id() == extension_misc::kIdentityApiUiAppId) {

Powered by Google App Engine
This is Rietveld 408576698