chrome/browser/ui/webui/chromeos/login/error_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/error_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/enrollment_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/eula_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 (c) 2012 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2012 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/error_screen_handler.h"	5 #include "chrome/browser/ui/webui/chromeos/login/error_screen_handler.h"

6	6

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

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

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

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

11 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"	11 #include "chrome/browser/chromeos/app_mode/app_session_lifetime.h"

12 #include "chrome/browser/chromeos/app_mode/certificate_manager_dialog.h"	12 #include "chrome/browser/chromeos/app_mode/certificate_manager_dialog.h"

13 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"	13 #include "chrome/browser/chromeos/login/ui/captive_portal_window_proxy.h"

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

15 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"	15 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"

16 #include "chrome/browser/extensions/component_loader.h"	16 #include "chrome/browser/extensions/component_loader.h"

17 #include "chrome/browser/extensions/extension_service.h"	17 #include "chrome/browser/extensions/extension_service.h"

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

19 #include "chrome/browser/ui/extensions/application_launch.h"	19 #include "chrome/browser/ui/extensions/application_launch.h"

20 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"	20 #include "chrome/browser/ui/webui/chromeos/login/native_window_delegate.h"

21 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"	21 #include "chrome/browser/ui/webui/chromeos/login/network_state_informer.h"

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

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

22 #include "chromeos/dbus/dbus_thread_manager.h"	24 #include "chromeos/dbus/dbus_thread_manager.h"

23 #include "chromeos/dbus/power_manager_client.h"	25 #include "chromeos/dbus/power_manager_client.h"

24 #include "chromeos/dbus/session_manager_client.h"	26 #include "chromeos/dbus/session_manager_client.h"

25 #include "chromeos/network/portal_detector/network_portal_detector.h"	27 #include "chromeos/network/portal_detector/network_portal_detector.h"

26 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"	28 #include "chromeos/network/portal_detector/network_portal_detector_strategy.h"

27 #include "components/user_manager/user_manager.h"	29 #include "components/user_manager/user_manager.h"

28 #include "extensions/browser/extension_system.h"	30 #include "extensions/browser/extension_system.h"

29 #include "grit/browser_resources.h"	31 #include "grit/browser_resources.h"

30 #include "grit/chromium_strings.h"

31 #include "grit/generated_resources.h"

32 #include "ui/strings/grit/ui_strings.h"	32 #include "ui/strings/grit/ui_strings.h"

33	33

34 namespace {	34 namespace {

35	35

36 const char kJsScreenPath[] = "login.ErrorMessageScreen";	36 const char kJsScreenPath[] = "login.ErrorMessageScreen";

37	37

38 } // namespace	38 } // namespace

39	39

40 namespace chromeos {	40 namespace chromeos {

41	41

(...skipping 247 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
289 params.SetString("network", network_);	289 params.SetString("network", network_);

290 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_);	290 params.SetBoolean("guestSigninAllowed", guest_signin_allowed_);

291 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_);	291 params.SetBoolean("offlineLoginAllowed", offline_login_allowed_);

292 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_);	292 params.SetBoolean("showConnectingIndicator", show_connecting_indicator_);

293 Show(parent_screen_, &params);	293 Show(parent_screen_, &params);

294 show_on_init_ = false;	294 show_on_init_ = false;

295 }	295 }

296 }	296 }

297	297

298 } // namespace chromeos	298 } // namespace chromeos

OLD	NEW