Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(56)

Side by Side Diff: chrome/browser/ui/webui/chromeos/login/terms_of_service_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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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/terms_of_service_screen_handler .h" 5 #include "chrome/browser/ui/webui/chromeos/login/terms_of_service_screen_handler .h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/bind.h" 9 #include "base/bind.h"
10 #include "base/bind_helpers.h" 10 #include "base/bind_helpers.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/prefs/pref_service.h" 12 #include "base/prefs/pref_service.h"
13 #include "base/strings/string_split.h" 13 #include "base/strings/string_split.h"
14 #include "base/values.h" 14 #include "base/values.h"
15 #include "chrome/browser/browser_process.h" 15 #include "chrome/browser/browser_process.h"
16 #include "chrome/browser/chromeos/base/locale_util.h" 16 #include "chrome/browser/chromeos/base/locale_util.h"
17 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h" 17 #include "chrome/browser/chromeos/login/screens/core_oobe_actor.h"
18 #include "chrome/browser/chromeos/profiles/profile_helper.h" 18 #include "chrome/browser/chromeos/profiles/profile_helper.h"
19 #include "chrome/browser/profiles/profile.h" 19 #include "chrome/browser/profiles/profile.h"
20 #include "chrome/browser/profiles/profile_manager.h" 20 #include "chrome/browser/profiles/profile_manager.h"
21 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 21 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
22 #include "chrome/common/pref_names.h" 22 #include "chrome/common/pref_names.h"
23 #include "chrome/grit/chromium_strings.h"
24 #include "chrome/grit/generated_resources.h"
23 #include "chromeos/ime/input_method_manager.h" 25 #include "chromeos/ime/input_method_manager.h"
24 #include "components/user_manager/user.h" 26 #include "components/user_manager/user.h"
25 #include "components/user_manager/user_manager.h" 27 #include "components/user_manager/user_manager.h"
26 #include "content/public/browser/web_ui.h" 28 #include "content/public/browser/web_ui.h"
27 #include "grit/chromium_strings.h"
28 #include "grit/generated_resources.h"
29 29
30 namespace { 30 namespace {
31 31
32 const char kJsScreenPath[] = "login.TermsOfServiceScreen"; 32 const char kJsScreenPath[] = "login.TermsOfServiceScreen";
33 33
34 } // namespace 34 } // namespace
35 35
36 namespace chromeos { 36 namespace chromeos {
37 37
38 TermsOfServiceScreenHandler::TermsOfServiceScreenHandler( 38 TermsOfServiceScreenHandler::TermsOfServiceScreenHandler(
(...skipping 173 matching lines...) Expand 10 before | Expand all | Expand 10 after
212 // and continue" button should not be accessible. If the user managed to 212 // and continue" button should not be accessible. If the user managed to
213 // activate it somehow anway, do not treat this as acceptance of the Terms 213 // activate it somehow anway, do not treat this as acceptance of the Terms
214 // and Conditions and end the session instead, as if the user had declined. 214 // and Conditions and end the session instead, as if the user had declined.
215 if (terms_of_service_.empty()) 215 if (terms_of_service_.empty())
216 screen_->OnDecline(); 216 screen_->OnDecline();
217 else 217 else
218 screen_->OnAccept(); 218 screen_->OnAccept();
219 } 219 }
220 220
221 } // namespace chromeos 221 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698