chrome/browser/ui/webui/signin/user_manager_screen_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/signin/user_manager_screen_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/signin/profile_signin_confirmation_ui.cc ('k') | chrome/browser/ui/webui/signin/user_manager_ui_browsertest.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 2013 The Chromium Authors. All rights reserved.	1 // Copyright 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/signin/user_manager_screen_handler.h"	5 #include "chrome/browser/ui/webui/signin/user_manager_screen_handler.h"

6	6

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

8 #include "base/prefs/pref_service.h"	8 #include "base/prefs/pref_service.h"

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

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

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

12 #include "chrome/browser/browser_process.h"	12 #include "chrome/browser/browser_process.h"

13 #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_ap i.h"	13 #include "chrome/browser/extensions/api/screenlock_private/screenlock_private_ap i.h"

14 #include "chrome/browser/profiles/profile.h"	14 #include "chrome/browser/profiles/profile.h"

15 #include "chrome/browser/profiles/profile_avatar_icon_util.h"	15 #include "chrome/browser/profiles/profile_avatar_icon_util.h"

16 #include "chrome/browser/profiles/profile_info_cache.h"	16 #include "chrome/browser/profiles/profile_info_cache.h"

17 #include "chrome/browser/profiles/profile_info_cache_observer.h"	17 #include "chrome/browser/profiles/profile_info_cache_observer.h"

18 #include "chrome/browser/profiles/profile_manager.h"	18 #include "chrome/browser/profiles/profile_manager.h"

19 #include "chrome/browser/profiles/profile_metrics.h"	19 #include "chrome/browser/profiles/profile_metrics.h"

20 #include "chrome/browser/profiles/profile_window.h"	20 #include "chrome/browser/profiles/profile_window.h"

21 #include "chrome/browser/profiles/profiles_state.h"	21 #include "chrome/browser/profiles/profiles_state.h"

22 #include "chrome/browser/signin/local_auth.h"	22 #include "chrome/browser/signin/local_auth.h"

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

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

25 #include "chrome/browser/ui/singleton_tabs.h"	25 #include "chrome/browser/ui/singleton_tabs.h"

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

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

	28 #include "chrome/grit/chromium_strings.h"

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

28 #include "content/public/browser/web_contents.h"	30 #include "content/public/browser/web_contents.h"

29 #include "content/public/browser/web_ui.h"	31 #include "content/public/browser/web_ui.h"

30 #include "google_apis/gaia/gaia_auth_fetcher.h"	32 #include "google_apis/gaia/gaia_auth_fetcher.h"

31 #include "google_apis/gaia/gaia_constants.h"	33 #include "google_apis/gaia/gaia_constants.h"

32 #include "grit/browser_resources.h"	34 #include "grit/browser_resources.h"

33 #include "grit/chromium_strings.h"

34 #include "grit/generated_resources.h"

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

36 #include "third_party/skia/include/core/SkBitmap.h"	36 #include "third_party/skia/include/core/SkBitmap.h"

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

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

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

40 #include "ui/gfx/image/image.h"	40 #include "ui/gfx/image/image.h"

41 #include "ui/gfx/image/image_skia.h"	41 #include "ui/gfx/image/image_skia.h"

42 #include "ui/gfx/image/image_util.h"	42 #include "ui/gfx/image/image_util.h"

43	43

44 namespace {	44 namespace {

(...skipping 628 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
673 } else {	673 } else {

674 web_ui()->CallJavascriptFunction(	674 web_ui()->CallJavascriptFunction(

675 "cr.ui.Oobe.showSignInError",	675 "cr.ui.Oobe.showSignInError",

676 base::FundamentalValue(0),	676 base::FundamentalValue(0),

677 base::StringValue(	677 base::StringValue(

678 l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_AUTHENTICATING)),	678 l10n_util::GetStringUTF8(IDS_LOGIN_ERROR_AUTHENTICATING)),

679 base::StringValue(""),	679 base::StringValue(""),

680 base::FundamentalValue(0));	680 base::FundamentalValue(0));

681 }	681 }

682 }	682 }

OLD	NEW