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

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

Issue 2603423002: cros: Fix user image change crash (Closed)
Patch Set: rebase Created 3 years, 11 months 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/settings/chromeos/change_picture_handler.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 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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_SETTINGS_CHROMEOS_CHANGE_PICTURE_HANDLER_H_ 5 #ifndef CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CHANGE_PICTURE_HANDLER_H_
6 #define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CHANGE_PICTURE_HANDLER_H_ 6 #define CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CHANGE_PICTURE_HANDLER_H_
7 7
8 #include "base/macros.h" 8 #include "base/macros.h"
9 #include "base/scoped_observer.h" 9 #include "base/scoped_observer.h"
10 #include "chrome/browser/chromeos/camera_presence_notifier.h" 10 #include "chrome/browser/chromeos/camera_presence_notifier.h"
(...skipping 108 matching lines...) Expand 10 before | Expand all | Expand 10 after
119 119
120 // Index of the previous user image. 120 // Index of the previous user image.
121 int previous_image_index_; 121 int previous_image_index_;
122 122
123 // Last user photo, if taken. 123 // Last user photo, if taken.
124 gfx::ImageSkia user_photo_; 124 gfx::ImageSkia user_photo_;
125 125
126 // Data URL for |user_photo_|. 126 // Data URL for |user_photo_|.
127 std::string user_photo_data_url_; 127 std::string user_photo_data_url_;
128 128
129 ScopedObserver<user_manager::UserManager, ChangePictureHandler>
130 user_manager_observer_;
129 ScopedObserver<CameraPresenceNotifier, ChangePictureHandler> camera_observer_; 131 ScopedObserver<CameraPresenceNotifier, ChangePictureHandler> camera_observer_;
130 132
131 DISALLOW_COPY_AND_ASSIGN(ChangePictureHandler); 133 DISALLOW_COPY_AND_ASSIGN(ChangePictureHandler);
132 }; 134 };
133 135
134 } // namespace settings 136 } // namespace settings
135 } // namespace chromeos 137 } // namespace chromeos
136 138
137 #endif // CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CHANGE_PICTURE_HANDLER_H_ 139 #endif // CHROME_BROWSER_UI_WEBUI_SETTINGS_CHROMEOS_CHANGE_PICTURE_HANDLER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/webui/settings/chromeos/change_picture_handler.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698