Move ShellWindow into apps component.

chrome/browser/extensions/api/identity/web_auth_flow.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/extensions/component_loader.h"
 #include "chrome/browser/extensions/event_router.h"
 #include "chrome/browser/extensions/extension_service.h"
 #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"
 #include "content/public/browser/notification_details.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/browser/notification_source.h"
 #include "content/public/browser/notification_types.h"
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/resource_request_details.h"
 #include "content/public/browser/web_contents.h"
 #include "crypto/random.h"
 #include "googleurl/src/gurl.h"
 #include "grit/browser_resources.h"
 
+using apps::ShellWindow;
 using content::RenderViewHost;
 using content::ResourceRedirectDetails;
 using content::WebContents;
 using content::WebContentsObserver;
 
 namespace extensions {
 
 WebAuthFlow::WebAuthFlow(
     Delegate* delegate,
     Profile* profile,
@@ skipping 74 matching lines @@
     shell_window_ = shell_window;
     WebContentsObserver::Observe(shell_window->web_contents());
 
     registrar_.Add(
         this,
         content::NOTIFICATION_WEB_CONTENTS_RENDER_VIEW_HOST_CREATED,
         content::NotificationService::AllBrowserContextsAndSources());
   }
 }
 
+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) {
     shell_window_ = NULL;
     registrar_.RemoveAll();
 
     if (delegate_)
       delegate_->OnAuthFlowFailure(WebAuthFlow::WINDOW_CLOSED);
   }
 }
@@ skipping 99 matching lines @@
 }
 
 void WebAuthFlow::DidNavigateMainFrame(
     const content::LoadCommittedDetails& details,
     const content::FrameNavigateParams& params) {
   if (delegate_ && details.http_status_code >= 400)
     delegate_->OnAuthFlowFailure(LOAD_FAILED);
 }
 
 }  // namespace extensions