Move apps/shell to extensions/shell.

athena/content/app_activity.cc

 // Copyright 2014 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 "athena/content/app_activity.h"
 
-#include "apps/shell/browser/shell_app_window.h"
 #include "athena/activity/public/activity_manager.h"
 #include "content/public/browser/web_contents.h"
+#include "extensions/shell/browser/shell_app_window.h"
 #include "ui/views/controls/webview/webview.h"
 
 namespace athena {
 
 // TODO(mukai): specifies the same accelerators of WebActivity.
-AppActivity::AppActivity(apps::ShellAppWindow* app_window)
+AppActivity::AppActivity(extensions::ShellAppWindow* app_window)
     : app_window_(app_window),
       web_view_(NULL),
       current_state_(ACTIVITY_UNLOADED) {
   DCHECK(app_window_);
 }
 
 AppActivity::~AppActivity() {
   if (GetCurrentState() != ACTIVITY_UNLOADED)
     SetCurrentState(ACTIVITY_UNLOADED);
 }
@@ skipping 98 matching lines @@
                               bool explicit_set) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 void AppActivity::DidUpdateFaviconURL(
     const std::vector<content::FaviconURL>& candidates) {
   ActivityManager::Get()->UpdateActivity(this);
 }
 
 }  // namespace athena