chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h - Issue 653723004: Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h

Issue 653723004: Revert of ChromeOS NetworkScreenHandler should not call CheckAndResolveLocale on UI thread. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 6 years, 2 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/webui/chromeos/login/network_screen_handler.cc ('k') | chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h

diff --git a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h

index f6cc021d2ecac6104351501f8e6f64f36bdf4998..d12fca4ba9cb37122f7ebe53166fe7f30b33e171 100644

--- a/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h

+++ b/chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler.h

@@ -9,7 +9,6 @@

#include "base/basictypes.h"

#include "base/compiler_specific.h"

-#include "chrome/browser/chromeos/base/locale_util.h"

#include "chrome/browser/chromeos/login/screens/terms_of_service_screen_actor.h"

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

@@ -43,8 +42,9 @@

virtual void Initialize() override;

// Callback invoked after the UI locale has been changed.

- void OnLanguageChangedCallback(

- const locale_util::LanguageSwitchResult& result);

+ void OnLanguageChangedCallback(const std::string& requested_locale,

+ const std::string& loaded_locale,

+ const bool success);

// Switch to the user's preferred input method and show the screen. This

// method is called after it has been ensured that the current UI locale