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

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: 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
« no previous file with comments | « no previous file | chrome/browser/ui/webui/chromeos/image_source.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 20 matching lines...) Expand all
31 public: 31 public:
32 ImageSource(); 32 ImageSource();
33 ~ImageSource() override; 33 ~ImageSource() override;
34 34
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& got_data_callback)
42 override;
43
42 std::string GetMimeType(const std::string& path) const override; 44 std::string GetMimeType(const std::string& path) const override;
43 45
44 private: 46 private:
45 void StartOnFileThread(
46 const std::string& path,
47 const content::URLDataSource::GotDataCallback& callback);
48
49 // Callback for user_manager::UserImageLoader.
50 void ImageLoaded(
51 const content::URLDataSource::GotDataCallback& callback,
52 const user_manager::UserImage& user_image) const;
53
54 // Checks whether we have allowed the image to be loaded. 47 // Checks whether we have allowed the image to be loaded.
55 bool IsWhitelisted(const std::string& path) const; 48 bool IsWhitelisted(const std::string& path) const;
56 49
57 // The background task runner on which file I/O and image decoding are done. 50 // The background task runner on which file I/O and image decoding are done.
58 scoped_refptr<base::SequencedTaskRunner> task_runner_; 51 scoped_refptr<base::SequencedTaskRunner> task_runner_;
59 52
60 scoped_refptr<UserImageLoader> image_loader_; 53 scoped_refptr<UserImageLoader> image_loader_;
61 54
62 base::WeakPtrFactory<ImageSource> weak_factory_; 55 base::WeakPtrFactory<ImageSource> weak_factory_;
63 56
64 DISALLOW_COPY_AND_ASSIGN(ImageSource); 57 DISALLOW_COPY_AND_ASSIGN(ImageSource);
65 }; 58 };
66 59
67 } // namespace chromeos 60 } // namespace chromeos
68 61
69 #endif // CHROME_BROWSER_UI_WEBUI_CHROMEOS_IMAGE_SOURCE_H_ 62 #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') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698