Update To 11.40.268.0

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

diff --git a/src/chrome/browser/ui/webui/fileicon_source.h b/src/chrome/browser/ui/webui/fileicon_source.h
index c5a73ea..6666aa3 100644 (file)
--- a/src/chrome/browser/ui/webui/fileicon_source.h
+++ b/src/chrome/browser/ui/webui/fileicon_source.h
@@ -8,10 +8,9 @@
 #include <string>
 
 #include "base/files/file_path.h"
+#include "base/task/cancelable_task_tracker.h"
 #include "chrome/browser/icon_manager.h"
-#include "chrome/common/cancelable_task_tracker.h"
 #include "content/public/browser/url_data_source.h"
-#include "ui/base/layout.h"
 
 namespace gfx {
 class Image;
@@ -24,23 +23,23 @@ class FileIconSource : public content::URLDataSource {
   explicit FileIconSource();
 
   // content::URLDataSource implementation.
-  virtual std::string GetSource() const OVERRIDE;
-  virtual void StartDataRequest(
+  std::string GetSource() const override;
+  void StartDataRequest(
       const std::string& path,
       int render_process_id,
       int render_frame_id,
-      const content::URLDataSource::GotDataCallback& callback) OVERRIDE;
-  virtual std::string GetMimeType(const std::string&) const OVERRIDE;
+      const content::URLDataSource::GotDataCallback& callback) override;
+  std::string GetMimeType(const std::string&) const override;
 
  protected:
-  virtual ~FileIconSource();
+  ~FileIconSource() override;
 
   // Once the |path| and |icon_size| has been determined from the request, this
   // function is called to perform the actual fetch. Declared as virtual for
   // testing.
   virtual void FetchFileIcon(
       const base::FilePath& path,
-      ui::ScaleFactor scale_factor,
+      float scale_factor,
       IconLoader::IconSize icon_size,
       const content::URLDataSource::GotDataCallback& callback);
 
@@ -54,7 +53,7 @@ class FileIconSource : public content::URLDataSource {
     content::URLDataSource::GotDataCallback callback;
 
     // The requested scale factor to respond with.
-    ui::ScaleFactor scale_factor;
+    float scale_factor;
   };
 
   // Called when favicon data is available from the history backend.
@@ -62,7 +61,7 @@ class FileIconSource : public content::URLDataSource {
                                gfx::Image* icon);
 
   // Tracks tasks requesting file icons.
-  CancelableTaskTracker cancelable_task_tracker_;
+  base::CancelableTaskTracker cancelable_task_tracker_;
 
   DISALLOW_COPY_AND_ASSIGN(FileIconSource);
 };