chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc - Issue 499163002: Use qualified path for grit/ui_strings.h

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/error_screen_handler.cc

Issue 499163002: Use qualified path for grit/ui_strings.h (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: 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

« no previous file with comments | « chrome/browser/ui/views/toolbar/toolbar_button.cc ('k') | components/infobars/DEPS » ('j') | no next file with comments »

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"

(...skipping 11 matching lines...) Expand all Loading...
22 #include "chromeos/dbus/dbus_thread_manager.h"	22 #include "chromeos/dbus/dbus_thread_manager.h"

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

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

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

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

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

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

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

30 #include "grit/chromium_strings.h"	30 #include "grit/chromium_strings.h"

31 #include "grit/generated_resources.h"	31 #include "grit/generated_resources.h"

32 #include "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

42 ErrorScreenHandler::ErrorScreenHandler(	42 ErrorScreenHandler::ErrorScreenHandler(

(...skipping 246 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