Removing base::ThreadRestrictions::ScopedAllowIO from icon_manager_linux.cc

chrome/browser/icon_loader.h

 // 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.
 
 #ifndef CHROME_BROWSER_ICON_LOADER_H_
 #define CHROME_BROWSER_ICON_LOADER_H_
 
 #include "build/build_config.h"
 
 #include <string>
 
 #include "base/basictypes.h"
+#include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop_proxy.h"
 #include "ui/gfx/image/image.h"
 
 #if defined(OS_WIN)
 // On Windows, we group files by their extension, with several exceptions:
 // .dll, .exe, .ico. See IconManager.h for explanation.
 typedef std::wstring IconGroupID;
 #elif defined(OS_POSIX)
@@ skipping 11 matching lines @@
  public:
   enum IconSize {
     SMALL = 0,  // 16x16
     NORMAL,     // 32x32
     LARGE,      // Windows: 32x32, Linux: 48x48, Mac: Unsupported
     ALL,        // All sizes available
   };
 
   class Delegate {
    public:
+    // Invoked when an icon group has been read, but before the icon data
+    // is read. If the icon is already cached, this method should call and
+    // return the results of OnImageLoaded with the cached image.
+    virtual bool OnGroupLoaded(IconLoader* source,
+                               const IconGroupID& group) = 0;
     // Invoked when an icon has been read. |source| is the IconLoader. If the
     // icon has been successfully loaded, result is non-null. This method must
     // return true if it is taking ownership of the returned image.
-    virtual bool OnImageLoaded(IconLoader* source, gfx::Image* result) = 0;
+    virtual bool OnImageLoaded(IconLoader* source,
+                               gfx::Image* result,
+                               const IconGroupID& group) = 0;
 
    protected:
     virtual ~Delegate() {}
   };
 
-  IconLoader(const IconGroupID& group, IconSize size, Delegate* delegate);
+  IconLoader(const base::FilePath& file_path,
+             IconSize size,
+             Delegate* delegate);
 
   // Start reading the icon on the file thread.
   void Start();
 
  private:
   friend class base::RefCountedThreadSafe<IconLoader>;
 
   virtual ~IconLoader();
 
+  // Get the identifying string for the given file. The implementation
+  // is in icon_loader_[platform].cc.
+  static IconGroupID ReadGroupIDFromFilepath(const base::FilePath& path);
+
+  void ReadGroup();
+  void OnReadGroup();
   void ReadIcon();
 
   void NotifyDelegate();
 
   // The message loop object of the thread in which we notify the delegate.
   scoped_refptr<base::MessageLoopProxy> target_message_loop_;
 
+  base::FilePath file_path_;
+
   IconGroupID group_;
 
   IconSize icon_size_;
 
   scoped_ptr<gfx::Image> image_;
 
   Delegate* delegate_;
 
   DISALLOW_COPY_AND_ASSIGN(IconLoader);
 };
 
 #endif  // CHROME_BROWSER_ICON_LOADER_H_