OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle
r.h" | 5 #include "chrome/browser/ui/webui/options/chromeos/change_picture_options_handle
r.h" |
6 | 6 |
7 #include "base/bind.h" | 7 #include "base/bind.h" |
8 #include "base/bind_helpers.h" | 8 #include "base/bind_helpers.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/path_service.h" | 10 #include "base/path_service.h" |
11 #include "base/string_util.h" | 11 #include "base/string_util.h" |
12 #include "base/values.h" | 12 #include "base/values.h" |
13 #include "chrome/browser/chromeos/login/camera_detector.h" | 13 #include "chrome/browser/chromeos/login/camera_detector.h" |
14 #include "chrome/browser/chromeos/login/default_user_images.h" | 14 #include "chrome/browser/chromeos/login/default_user_images.h" |
15 #include "chrome/browser/chromeos/login/user_manager.h" | 15 #include "chrome/browser/chromeos/login/user_manager.h" |
16 #include "chrome/browser/chromeos/options/take_photo_dialog.h" | 16 #include "chrome/browser/chromeos/options/take_photo_dialog.h" |
17 #include "chrome/browser/profiles/profile.h" | 17 #include "chrome/browser/profiles/profile.h" |
18 #include "chrome/browser/ui/browser_list.h" | 18 #include "chrome/browser/ui/browser_list.h" |
19 #include "chrome/browser/ui/browser_window.h" | 19 #include "chrome/browser/ui/browser_window.h" |
| 20 #include "chrome/browser/ui/dialog_style.h" |
20 #include "chrome/browser/ui/views/window.h" | 21 #include "chrome/browser/ui/views/window.h" |
21 #include "chrome/browser/ui/webui/web_ui_util.cc" | 22 #include "chrome/browser/ui/webui/web_ui_util.cc" |
22 #include "chrome/common/chrome_notification_types.h" | 23 #include "chrome/common/chrome_notification_types.h" |
23 #include "chrome/common/chrome_paths.h" | 24 #include "chrome/common/chrome_paths.h" |
24 #include "chrome/common/url_constants.h" | 25 #include "chrome/common/url_constants.h" |
25 #include "content/public/browser/notification_service.h" | 26 #include "content/public/browser/notification_service.h" |
26 #include "content/public/common/url_constants.h" | 27 #include "content/public/common/url_constants.h" |
27 #include "grit/generated_resources.h" | 28 #include "grit/generated_resources.h" |
28 #include "grit/theme_resources.h" | 29 #include "grit/theme_resources.h" |
29 #include "third_party/skia/include/core/SkBitmap.h" | 30 #include "third_party/skia/include/core/SkBitmap.h" |
(...skipping 124 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
154 FILE_PATH_LITERAL(""), | 155 FILE_PATH_LITERAL(""), |
155 web_ui_->tab_contents(), | 156 web_ui_->tab_contents(), |
156 GetBrowserWindow(), | 157 GetBrowserWindow(), |
157 NULL); | 158 NULL); |
158 } | 159 } |
159 | 160 |
160 void ChangePictureOptionsHandler::HandleTakePhoto(const ListValue* args) { | 161 void ChangePictureOptionsHandler::HandleTakePhoto(const ListValue* args) { |
161 DCHECK(args && args->empty()); | 162 DCHECK(args && args->empty()); |
162 views::Widget* window = browser::CreateViewsWindow( | 163 views::Widget* window = browser::CreateViewsWindow( |
163 GetBrowserWindow(), | 164 GetBrowserWindow(), |
164 new TakePhotoDialog(this)); | 165 new TakePhotoDialog(this), |
| 166 STYLE_GENERIC); |
165 window->SetAlwaysOnTop(true); | 167 window->SetAlwaysOnTop(true); |
166 window->Show(); | 168 window->Show(); |
167 } | 169 } |
168 | 170 |
169 void ChangePictureOptionsHandler::HandleOnPageShown( | 171 void ChangePictureOptionsHandler::HandleOnPageShown( |
170 const base::ListValue* args) { | 172 const base::ListValue* args) { |
171 DCHECK(args && args->empty()); | 173 DCHECK(args && args->empty()); |
172 CheckCameraPresence(); | 174 CheckCameraPresence(); |
173 SendSelectedImage(); | 175 SendSelectedImage(); |
174 UpdateProfileImage(); | 176 UpdateProfileImage(); |
(...skipping 151 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
326 | 328 |
327 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const { | 329 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const { |
328 Browser* browser = | 330 Browser* browser = |
329 BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui_)); | 331 BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui_)); |
330 if (!browser) | 332 if (!browser) |
331 return NULL; | 333 return NULL; |
332 return browser->window()->GetNativeHandle(); | 334 return browser->window()->GetNativeHandle(); |
333 } | 335 } |
334 | 336 |
335 } // namespace chromeos | 337 } // namespace chromeos |
OLD | NEW |