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

Side by Side 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: Self review 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 unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/extensions/api/identity/web_auth_flow.h" 5 #include "chrome/browser/extensions/api/identity/web_auth_flow.h"
6 6
7 #include "apps/shell_window.h"
7 #include "base/base64.h" 8 #include "base/base64.h"
8 #include "base/location.h" 9 #include "base/location.h"
9 #include "base/message_loop.h" 10 #include "base/message_loop.h"
10 #include "base/strings/string_util.h" 11 #include "base/strings/string_util.h"
11 #include "base/strings/utf_string_conversions.h" 12 #include "base/strings/utf_string_conversions.h"
12 #include "chrome/browser/extensions/component_loader.h" 13 #include "chrome/browser/extensions/component_loader.h"
13 #include "chrome/browser/extensions/event_router.h" 14 #include "chrome/browser/extensions/event_router.h"
14 #include "chrome/browser/extensions/extension_service.h" 15 #include "chrome/browser/extensions/extension_service.h"
15 #include "chrome/browser/extensions/extension_system.h" 16 #include "chrome/browser/extensions/extension_system.h"
16 #include "chrome/browser/extensions/extension_system.h" 17 #include "chrome/browser/extensions/extension_system.h"
17 #include "chrome/browser/profiles/profile.h" 18 #include "chrome/browser/profiles/profile.h"
18 #include "chrome/browser/ui/extensions/shell_window.h"
19 #include "chrome/common/extensions/extension_constants.h" 19 #include "chrome/common/extensions/extension_constants.h"
20 #include "content/public/browser/navigation_details.h" 20 #include "content/public/browser/navigation_details.h"
21 #include "content/public/browser/navigation_entry.h" 21 #include "content/public/browser/navigation_entry.h"
22 #include "content/public/browser/notification_details.h" 22 #include "content/public/browser/notification_details.h"
23 #include "content/public/browser/notification_source.h" 23 #include "content/public/browser/notification_source.h"
24 #include "content/public/browser/notification_types.h" 24 #include "content/public/browser/notification_types.h"
25 #include "content/public/browser/render_view_host.h" 25 #include "content/public/browser/render_view_host.h"
26 #include "content/public/browser/resource_request_details.h" 26 #include "content/public/browser/resource_request_details.h"
27 #include "content/public/browser/web_contents.h" 27 #include "content/public/browser/web_contents.h"
28 #include "crypto/random.h" 28 #include "crypto/random.h"
29 #include "googleurl/src/gurl.h" 29 #include "googleurl/src/gurl.h"
30 #include "grit/browser_resources.h" 30 #include "grit/browser_resources.h"
31 31
32 using apps::ShellWindow;
32 using content::RenderViewHost; 33 using content::RenderViewHost;
33 using content::ResourceRedirectDetails; 34 using content::ResourceRedirectDetails;
34 using content::WebContents; 35 using content::WebContents;
35 using content::WebContentsObserver; 36 using content::WebContentsObserver;
36 37
37 namespace extensions { 38 namespace extensions {
38 39
39 WebAuthFlow::WebAuthFlow( 40 WebAuthFlow::WebAuthFlow(
40 Delegate* delegate, 41 Delegate* delegate,
41 Profile* profile, 42 Profile* profile,
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
116 shell_window_ = shell_window; 117 shell_window_ = shell_window;
117 WebContentsObserver::Observe(shell_window->web_contents()); 118 WebContentsObserver::Observe(shell_window->web_contents());
118 119
119 registrar_.Add( 120 registrar_.Add(
120 this, 121 this,
121 content::NOTIFICATION_WEB_CONTENTS_RENDER_VIEW_HOST_CREATED, 122 content::NOTIFICATION_WEB_CONTENTS_RENDER_VIEW_HOST_CREATED,
122 content::NotificationService::AllBrowserContextsAndSources()); 123 content::NotificationService::AllBrowserContextsAndSources());
123 } 124 }
124 } 125 }
125 126
127 void WebAuthFlow::OnShellWindowIconChanged(ShellWindow* shell_window) {}
128
126 void WebAuthFlow::OnShellWindowRemoved(ShellWindow* shell_window) { 129 void WebAuthFlow::OnShellWindowRemoved(ShellWindow* shell_window) {
127 if (shell_window->window_key() == shell_window_key_ && 130 if (shell_window->window_key() == shell_window_key_ &&
128 shell_window->extension()->id() == extension_misc::kIdentityApiUiAppId) { 131 shell_window->extension()->id() == extension_misc::kIdentityApiUiAppId) {
129 shell_window_ = NULL; 132 shell_window_ = NULL;
130 registrar_.RemoveAll(); 133 registrar_.RemoveAll();
131 134
132 if (delegate_) 135 if (delegate_)
133 delegate_->OnAuthFlowFailure(WebAuthFlow::WINDOW_CLOSED); 136 delegate_->OnAuthFlowFailure(WebAuthFlow::WINDOW_CLOSED);
134 } 137 }
135 } 138 }
(...skipping 99 matching lines...) Expand 10 before | Expand all | Expand 10 after
235 } 238 }
236 239
237 void WebAuthFlow::DidNavigateMainFrame( 240 void WebAuthFlow::DidNavigateMainFrame(
238 const content::LoadCommittedDetails& details, 241 const content::LoadCommittedDetails& details,
239 const content::FrameNavigateParams& params) { 242 const content::FrameNavigateParams& params) {
240 if (delegate_ && details.http_status_code >= 400) 243 if (delegate_ && details.http_status_code >= 400)
241 delegate_->OnAuthFlowFailure(LOAD_FAILED); 244 delegate_->OnAuthFlowFailure(LOAD_FAILED);
242 } 245 }
243 246
244 } // namespace extensions 247 } // namespace extensions
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698