Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(13)

Side by Side Diff: chrome/browser/ui/webui/chromeos/image_source.h

Issue 780203002: Fix threading bugs in product label UI. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: File path and ImageSource changes Created 6 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
1 // Copyright 2014 The Chromium Authors. All rights reserved. 1 // Copyright 2014 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGE_SOURCE_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGE_SOURCE_H_
6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGE_SOURCE_H_ 6 #define CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGE_SOURCE_H_
7 7
8 #include <string> 8 #include <string>
9 9
10 #include "base/macros.h" 10 #include "base/macros.h"
(...skipping 24 matching lines...) Expand all
35 // content::URLDataSource implementation. 35 // content::URLDataSource implementation.
36 std::string GetSource() const override; 36 std::string GetSource() const override;
37 void StartDataRequest( 37 void StartDataRequest(
38 const std::string& path, 38 const std::string& path,
39 int render_process_id, 39 int render_process_id,
40 int render_frame_id, 40 int render_frame_id,
41 const content::URLDataSource::GotDataCallback& callback) override; 41 const content::URLDataSource::GotDataCallback& callback) override;
42 std::string GetMimeType(const std::string& path) const override; 42 std::string GetMimeType(const std::string& path) const override;
43 43
44 private: 44 private:
45 void StartOnFileThread(
46 const std::string& path,
47 const content::URLDataSource::GotDataCallback& callback);
48
49 // Callback for user_manager::UserImageLoader. 45 // Callback for user_manager::UserImageLoader.
50 void ImageLoaded( 46 void ImageLoaded(
51 const content::URLDataSource::GotDataCallback& callback, 47 const content::URLDataSource::GotDataCallback& callback,
52 const user_manager::UserImage& user_image) const; 48 const user_manager::UserImage& user_image) const;
53 49
54 // Checks whether we have allowed the image to be loaded. 50 // Checks whether we have allowed the image to be loaded.
55 bool IsWhitelisted(const std::string& path) const; 51 bool IsWhitelisted(const std::string& path) const;
56 52
57 // The background task runner on which file I/O and image decoding are done. 53 // The background task runner on which file I/O and image decoding are done.
58 scoped_refptr<base::SequencedTaskRunner> task_runner_; 54 scoped_refptr<base::SequencedTaskRunner> task_runner_;
59 55
60 scoped_refptr<UserImageLoader> image_loader_; 56 scoped_refptr<UserImageLoader> image_loader_;
61 57
62 base::WeakPtrFactory<ImageSource> weak_factory_; 58 base::WeakPtrFactory<ImageSource> weak_factory_;
63 59
64 DISALLOW_COPY_AND_ASSIGN(ImageSource); 60 DISALLOW_COPY_AND_ASSIGN(ImageSource);
65 }; 61 };
66 62
67 } // namespace chromeos 63 } // namespace chromeos
68 64
69 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGE_SOURCE_H_ 65 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGE_SOURCE_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/image_source.cc » ('j') | chrome/browser/ui/webui/chromeos/image_source.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698