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

Side by Side Diff: chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc

Issue 8547015: Revert 110949 - views: Move widget/ directory to ui/views. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 1 month 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 | Annotate | Revision Log
OLDNEW
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"
(...skipping 11 matching lines...) Expand all
22 #include "chrome/common/chrome_notification_types.h" 22 #include "chrome/common/chrome_notification_types.h"
23 #include "chrome/common/chrome_paths.h" 23 #include "chrome/common/chrome_paths.h"
24 #include "chrome/common/url_constants.h" 24 #include "chrome/common/url_constants.h"
25 #include "content/public/browser/notification_service.h" 25 #include "content/public/browser/notification_service.h"
26 #include "content/public/common/url_constants.h" 26 #include "content/public/common/url_constants.h"
27 #include "grit/generated_resources.h" 27 #include "grit/generated_resources.h"
28 #include "grit/theme_resources.h" 28 #include "grit/theme_resources.h"
29 #include "third_party/skia/include/core/SkBitmap.h" 29 #include "third_party/skia/include/core/SkBitmap.h"
30 #include "ui/base/l10n/l10n_util.h" 30 #include "ui/base/l10n/l10n_util.h"
31 #include "ui/base/resource/resource_bundle.h" 31 #include "ui/base/resource/resource_bundle.h"
32 #include "ui/views/widget/widget.h" 32 #include "views/widget/widget.h"
33 33
34 namespace chromeos { 34 namespace chromeos {
35 35
36 namespace { 36 namespace {
37 37
38 // Returns info about extensions for files we support as user images. 38 // Returns info about extensions for files we support as user images.
39 SelectFileDialog::FileTypeInfo GetUserImageFileTypeInfo() { 39 SelectFileDialog::FileTypeInfo GetUserImageFileTypeInfo() {
40 SelectFileDialog::FileTypeInfo file_type_info; 40 SelectFileDialog::FileTypeInfo file_type_info;
41 file_type_info.extensions.resize(5); 41 file_type_info.extensions.resize(5);
42 42
(...skipping 283 matching lines...) Expand 10 before | Expand all | Expand 10 after
326 326
327 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const { 327 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {
328 Browser* browser = 328 Browser* browser =
329 BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui_)); 329 BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui_));
330 if (!browser) 330 if (!browser)
331 return NULL; 331 return NULL;
332 return browser->window()->GetNativeHandle(); 332 return browser->window()->GetNativeHandle();
333 } 333 }
334 334
335 } // namespace chromeos 335 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698