chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc - Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership...

Side by Side Diff: chrome/browser/ui/webui/options2/chromeos/change_picture_options_handler2.cc

Issue 9224002: Make WebUI objects not derive from WebUI. WebUI objects own the controller. This is the ownership... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: sync to head to clear linux_chromeos browsertest failures Created 8 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 | Annotate | Revision Log

« no previous file with comments | « chrome/browser/ui/webui/options2/chromeos/bluetooth_options_handler2.cc ('k') | chrome/browser/ui/webui/options2/chromeos/core_chromeos_options_handler2.cc » ('j') | content/browser/tab_contents/render_view_host_manager_unittest.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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/options2/chromeos/change_picture_options_handl er2.h"	5 #include "chrome/browser/ui/webui/options2/chromeos/change_picture_options_handl er2.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/dialog_style.h"

21 #include "chrome/browser/ui/views/window.h"	21 #include "chrome/browser/ui/views/window.h"

22 #include "chrome/browser/ui/webui/web_ui_util.h"	22 #include "chrome/browser/ui/webui/web_ui_util.h"

23 #include "chrome/common/chrome_notification_types.h"	23 #include "chrome/common/chrome_notification_types.h"

24 #include "chrome/common/chrome_paths.h"	24 #include "chrome/common/chrome_paths.h"

25 #include "chrome/common/url_constants.h"	25 #include "chrome/common/url_constants.h"

	26 #include "content/browser/webui/web_ui.h"

26 #include "content/public/browser/notification_service.h"	27 #include "content/public/browser/notification_service.h"

27 #include "content/public/common/url_constants.h"	28 #include "content/public/common/url_constants.h"

28 #include "grit/generated_resources.h"	29 #include "grit/generated_resources.h"

29 #include "grit/theme_resources.h"	30 #include "grit/theme_resources.h"

30 #include "third_party/skia/include/core/SkBitmap.h"	31 #include "third_party/skia/include/core/SkBitmap.h"

31 #include "ui/base/l10n/l10n_util.h"	32 #include "ui/base/l10n/l10n_util.h"

32 #include "ui/base/resource/resource_bundle.h"	33 #include "ui/base/resource/resource_bundle.h"

33 #include "ui/views/widget/widget.h"	34 #include "ui/views/widget/widget.h"

34	35

35 namespace chromeos {	36 namespace chromeos {

(...skipping 303 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
339 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {	340 gfx::NativeWindow ChangePictureOptionsHandler::GetBrowserWindow() const {

340 Browser* browser =	341 Browser* browser =

341 BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui()));	342 BrowserList::FindBrowserWithProfile(Profile::FromWebUI(web_ui()));

342 if (!browser)	343 if (!browser)

343 return NULL;	344 return NULL;

344 return browser->window()->GetNativeHandle();	345 return browser->window()->GetNativeHandle();

345 }	346 }

346	347

347 } // namespace options2	348 } // namespace options2

348 } // namespace chromeos	349 } // namespace chromeos

OLD	NEW