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

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

Issue 878253002: LocalizedValuesBuilder moved to components/login. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed dependency on 'base'. Created 5 years, 10 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
OLDNEW
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/app_launch_splash_screen_handle r.h" 5 #include "chrome/browser/ui/webui/chromeos/login/app_launch_splash_screen_handle r.h"
6 6
7 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h" 7 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
8 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h" 8 #include "chrome/browser/chromeos/login/screens/error_screen_actor.h"
9 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h" 9 #include "chrome/browser/ui/webui/chromeos/login/oobe_ui.h"
10 #include "chrome/grit/chromium_strings.h" 10 #include "chrome/grit/chromium_strings.h"
11 #include "chrome/grit/generated_resources.h" 11 #include "chrome/grit/generated_resources.h"
12 #include "chromeos/network/network_state.h" 12 #include "chromeos/network/network_state.h"
13 #include "chromeos/network/network_state_handler.h" 13 #include "chromeos/network/network_state_handler.h"
14 #include "components/login/localized_values_builder.h"
14 #include "grit/chrome_unscaled_resources.h" 15 #include "grit/chrome_unscaled_resources.h"
15 #include "ui/base/l10n/l10n_util.h" 16 #include "ui/base/l10n/l10n_util.h"
16 #include "ui/base/resource/resource_bundle.h" 17 #include "ui/base/resource/resource_bundle.h"
17 #include "ui/base/webui/web_ui_util.h" 18 #include "ui/base/webui/web_ui_util.h"
18 19
19 namespace { 20 namespace {
20 21
21 const char kJsScreenPath[] = "login.AppLaunchSplashScreen"; 22 const char kJsScreenPath[] = "login.AppLaunchSplashScreen";
22 23
23 // Returns network name by service path. 24 // Returns network name by service path.
(...skipping 23 matching lines...) Expand all
47 network_config_done_(false), 48 network_config_done_(false),
48 network_config_requested_(false) { 49 network_config_requested_(false) {
49 network_state_informer_->AddObserver(this); 50 network_state_informer_->AddObserver(this);
50 } 51 }
51 52
52 AppLaunchSplashScreenHandler::~AppLaunchSplashScreenHandler() { 53 AppLaunchSplashScreenHandler::~AppLaunchSplashScreenHandler() {
53 network_state_informer_->RemoveObserver(this); 54 network_state_informer_->RemoveObserver(this);
54 } 55 }
55 56
56 void AppLaunchSplashScreenHandler::DeclareLocalizedValues( 57 void AppLaunchSplashScreenHandler::DeclareLocalizedValues(
57 LocalizedValuesBuilder* builder) { 58 ::login::LocalizedValuesBuilder* builder) {
58
59 builder->Add("appStartMessage", IDS_APP_START_NETWORK_WAIT_MESSAGE); 59 builder->Add("appStartMessage", IDS_APP_START_NETWORK_WAIT_MESSAGE);
60 builder->Add("configureNetwork", IDS_APP_START_CONFIGURE_NETWORK); 60 builder->Add("configureNetwork", IDS_APP_START_CONFIGURE_NETWORK);
61 61
62 const base::string16 product_os_name = 62 const base::string16 product_os_name =
63 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME); 63 l10n_util::GetStringUTF16(IDS_SHORT_PRODUCT_OS_NAME);
64 builder->Add( 64 builder->Add(
65 "shortcutInfo", 65 "shortcutInfo",
66 l10n_util::GetStringFUTF16(IDS_APP_START_BAILOUT_SHORTCUT_FORMAT, 66 l10n_util::GetStringFUTF16(IDS_APP_START_BAILOUT_SHORTCUT_FORMAT,
67 product_os_name)); 67 product_os_name));
68 68
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
282 DCHECK(online_state_); 282 DCHECK(online_state_);
283 if (delegate_ && online_state_) { 283 if (delegate_ && online_state_) {
284 network_config_requested_ = false; 284 network_config_requested_ = false;
285 network_config_done_ = true; 285 network_config_done_ = true;
286 delegate_->OnNetworkConfigRequested(false); 286 delegate_->OnNetworkConfigRequested(false);
287 Show(app_id_); 287 Show(app_id_);
288 } 288 }
289 } 289 }
290 290
291 } // namespace chromeos 291 } // namespace chromeos
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698