chrome/browser/ui/webui/chromeos/login/gaia_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/chromeos/login/gaia_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/chromeos/login/eula_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/hid_detection_screen_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 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/chromeos/login/gaia_screen_handler.h"	5 #include "chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.h"

6	6

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

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

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

10 #include "base/strings/utf_string_conversions.h"	10 #include "base/strings/utf_string_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/browser_shutdown.h"	13 #include "chrome/browser/browser_shutdown.h"

14 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"	14 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"

15 #include "chrome/browser/chromeos/policy/consumer_management_service.h"	15 #include "chrome/browser/chromeos/policy/consumer_management_service.h"

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

17 #include "chrome/browser/chromeos/settings/cros_settings.h"	17 #include "chrome/browser/chromeos/settings/cros_settings.h"

18 #include "chrome/browser/io_thread.h"	18 #include "chrome/browser/io_thread.h"

19 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"	19 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"

20 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"	20 #include "chrome/browser/ui/webui/signin/inline_login_ui.h"

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

21 #include "chromeos/chromeos_switches.h"	22 #include "chromeos/chromeos_switches.h"

22 #include "chromeos/settings/cros_settings_names.h"	23 #include "chromeos/settings/cros_settings_names.h"

23 #include "components/user_manager/user_manager.h"	24 #include "components/user_manager/user_manager.h"

24 #include "content/public/browser/browser_thread.h"	25 #include "content/public/browser/browser_thread.h"

25 #include "content/public/browser/render_frame_host.h"	26 #include "content/public/browser/render_frame_host.h"

26 #include "google_apis/gaia/gaia_auth_util.h"	27 #include "google_apis/gaia/gaia_auth_util.h"

27 #include "google_apis/gaia/gaia_switches.h"	28 #include "google_apis/gaia/gaia_switches.h"

28 #include "google_apis/gaia/gaia_urls.h"	29 #include "google_apis/gaia/gaia_urls.h"

29 #include "grit/generated_resources.h"

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

31	31

32 using content::BrowserThread;	32 using content::BrowserThread;

33	33

34 namespace chromeos {	34 namespace chromeos {

35	35

36 namespace {	36 namespace {

37	37

38 const char kJsScreenPath[] = "login.GaiaSigninScreen";	38 const char kJsScreenPath[] = "login.GaiaSigninScreen";

39 const char kAuthIframeParentName[] = "signin-frame";	39 const char kAuthIframeParentName[] = "signin-frame";

(...skipping 575 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
615	615

616 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {	616 SigninScreenHandlerDelegate* GaiaScreenHandler::Delegate() {

617 DCHECK(signin_screen_handler_);	617 DCHECK(signin_screen_handler_);

618 return signin_screen_handler_->delegate_;	618 return signin_screen_handler_->delegate_;

619 }	619 }

620	620

621 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {	621 void GaiaScreenHandler::SetSigninScreenHandler(SigninScreenHandler* handler) {

622 signin_screen_handler_ = handler;	622 signin_screen_handler_ = handler;

623 }	623 }

624 } // namespace chromeos	624 } // namespace chromeos

OLD	NEW