chrome/browser/ui/webui/options/chromeos/change_picture_options_handler.cc - Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 …

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

Issue 498773003: Use a qualified path for chromium_strings, google_chrome_strings, and generated_resources. (part 2 … (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 3 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/options/chromeos/bluetooth_options_handler.cc ('k') | chrome/browser/ui/webui/options/chromeos/consumer_management_handler.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2013 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 "ash/audio/sounds.h"	7 #include "ash/audio/sounds.h"

8 #include "base/bind.h"	8 #include "base/bind.h"

9 #include "base/bind_helpers.h"	9 #include "base/bind_helpers.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

11 #include "base/metrics/histogram.h"	11 #include "base/metrics/histogram.h"

12 #include "base/path_service.h"	12 #include "base/path_service.h"

13 #include "base/strings/string_util.h"	13 #include "base/strings/string_util.h"

14 #include "base/strings/utf_string_conversions.h"	14 #include "base/strings/utf_string_conversions.h"

15 #include "base/values.h"	15 #include "base/values.h"

16 #include "chrome/browser/chrome_notification_types.h"	16 #include "chrome/browser/chrome_notification_types.h"

17 #include "chrome/browser/chromeos/camera_presence_notifier.h"	17 #include "chrome/browser/chromeos/camera_presence_notifier.h"

18 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"	18 #include "chrome/browser/chromeos/login/users/avatar/user_image_manager.h"

19 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"	19 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"

20 #include "chrome/browser/chromeos/profiles/profile_helper.h"	20 #include "chrome/browser/chromeos/profiles/profile_helper.h"

21 #include "chrome/browser/ui/browser_finder.h"	21 #include "chrome/browser/ui/browser_finder.h"

22 #include "chrome/browser/ui/browser_window.h"	22 #include "chrome/browser/ui/browser_window.h"

23 #include "chrome/browser/ui/chrome_select_file_policy.h"	23 #include "chrome/browser/ui/chrome_select_file_policy.h"

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

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

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

	27 #include "chrome/grit/generated_resources.h"

27 #include "chromeos/audio/chromeos_sounds.h"	28 #include "chromeos/audio/chromeos_sounds.h"

28 #include "components/user_manager/user.h"	29 #include "components/user_manager/user.h"

29 #include "components/user_manager/user_image/default_user_images.h"	30 #include "components/user_manager/user_image/default_user_images.h"

30 #include "components/user_manager/user_image/user_image.h"	31 #include "components/user_manager/user_image/user_image.h"

31 #include "components/user_manager/user_manager.h"	32 #include "components/user_manager/user_manager.h"

32 #include "content/public/browser/browser_thread.h"	33 #include "content/public/browser/browser_thread.h"

33 #include "content/public/browser/notification_service.h"	34 #include "content/public/browser/notification_service.h"

34 #include "content/public/browser/web_ui.h"	35 #include "content/public/browser/web_ui.h"

35 #include "content/public/common/url_constants.h"	36 #include "content/public/common/url_constants.h"

36 #include "grit/browser_resources.h"	37 #include "grit/browser_resources.h"

37 #include "grit/generated_resources.h"

38 #include "grit/theme_resources.h"	38 #include "grit/theme_resources.h"

39 #include "net/base/data_url.h"	39 #include "net/base/data_url.h"

40 #include "ui/base/l10n/l10n_util.h"	40 #include "ui/base/l10n/l10n_util.h"

41 #include "ui/base/resource/resource_bundle.h"	41 #include "ui/base/resource/resource_bundle.h"

42 #include "ui/base/webui/web_ui_util.h"	42 #include "ui/base/webui/web_ui_util.h"

43 #include "ui/views/widget/widget.h"	43 #include "ui/views/widget/widget.h"

44 #include "url/gurl.h"	44 #include "url/gurl.h"

45	45

46 using content::BrowserThread;	46 using content::BrowserThread;

47	47

(...skipping 427 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
475 user_manager::User* ChangePictureOptionsHandler::GetUser() const {	475 user_manager::User* ChangePictureOptionsHandler::GetUser() const {

476 Profile* profile = Profile::FromWebUI(web_ui());	476 Profile* profile = Profile::FromWebUI(web_ui());

477 user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);	477 user_manager::User* user = ProfileHelper::Get()->GetUserByProfile(profile);

478 if (!user)	478 if (!user)

479 return user_manager::UserManager::Get()->GetActiveUser();	479 return user_manager::UserManager::Get()->GetActiveUser();

480 return user;	480 return user;

481 }	481 }

482	482

483 } // namespace options	483 } // namespace options

484 } // namespace chromeos	484 } // namespace chromeos

OLD	NEW