Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / ui / webui / ntp / app_launcher_handler.h

diff --git a/src/chrome/browser/ui/webui/ntp/app_launcher_handler.h b/src/chrome/browser/ui/webui/ntp/app_launcher_handler.h
index a3547bb..b6dc2dc 100644 (file)
--- a/src/chrome/browser/ui/webui/ntp/app_launcher_handler.h
+++ b/src/chrome/browser/ui/webui/ntp/app_launcher_handler.h
@@ -11,10 +11,10 @@
 #include "apps/metrics_names.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/prefs/pref_change_registrar.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/extensions/extension_uninstall_dialog.h"
 #include "chrome/browser/favicon/favicon_service.h"
 #include "chrome/browser/ui/extensions/extension_enable_flow_delegate.h"
-#include "chrome/common/cancelable_task_tracker.h"
 #include "chrome/common/extensions/extension_constants.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
@@ -27,7 +27,7 @@ class ExtensionService;
 class PrefChangeRegistrar;
 class Profile;
 
-namespace chrome {
+namespace favicon_base {
 struct FaviconImageResult;
 }
 
@@ -111,7 +111,6 @@ class AppLauncherHandler : public content::WebUIMessageHandler,
     AppInstallInfo();
     ~AppInstallInfo();
 
-    bool is_bookmark_app;
     base::string16 title;
     GURL app_url;
     syncer::StringOrdinal page_ordinal;
@@ -137,7 +136,7 @@ class AppLauncherHandler : public content::WebUIMessageHandler,
 
   // Continuation for installing a bookmark app after favicon lookup.
   void OnFaviconForApp(scoped_ptr<AppInstallInfo> install_info,
-                       const chrome::FaviconImageResult& image_result);
+                       const favicon_base::FaviconImageResult& image_result);
 
   // Sends |highlight_app_id_| to the js.
   void SetAppToBeHighlighted();
@@ -190,7 +189,7 @@ class AppLauncherHandler : public content::WebUIMessageHandler,
   std::string highlight_app_id_;
 
   // Used for favicon loading tasks.
-  CancelableTaskTracker cancelable_task_tracker_;
+  base::CancelableTaskTracker cancelable_task_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(AppLauncherHandler);
 };