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

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

Issue 7779010: Implements frame sniffer to watch iframe loading state. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: merged Created 9 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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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/signin_screen_handler.h" 5 #include "chrome/browser/ui/webui/chromeos/login/signin_screen_handler.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/stringprintf.h" 8 #include "base/stringprintf.h"
9 #include "base/task.h" 9 #include "base/task.h"
10 #include "base/values.h" 10 #include "base/values.h"
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
153 localized_strings->SetString("addUser", 153 localized_strings->SetString("addUser",
154 l10n_util::GetStringUTF16(IDS_ADD_USER_BUTTON)); 154 l10n_util::GetStringUTF16(IDS_ADD_USER_BUTTON));
155 localized_strings->SetString("cancel", 155 localized_strings->SetString("cancel",
156 l10n_util::GetStringUTF16(IDS_CANCEL)); 156 l10n_util::GetStringUTF16(IDS_CANCEL));
157 localized_strings->SetString("addUserOfflineMessage", 157 localized_strings->SetString("addUserOfflineMessage",
158 l10n_util::GetStringUTF16(IDS_LOGIN_ERROR_ADD_USER_OFFLINE)); 158 l10n_util::GetStringUTF16(IDS_LOGIN_ERROR_ADD_USER_OFFLINE));
159 localized_strings->SetString("offlineMessageTitle", 159 localized_strings->SetString("offlineMessageTitle",
160 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_TITLE)); 160 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_TITLE));
161 localized_strings->SetString("offlineMessageBody", 161 localized_strings->SetString("offlineMessageBody",
162 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_MESSAGE)); 162 l10n_util::GetStringUTF16(IDS_LOGIN_OFFLINE_MESSAGE));
163 localized_strings->SetString("captivePortalMessage",
164 l10n_util::GetStringUTF16(IDS_LOGIN_MAYBE_CAPTIVE_PORTAL));
163 localized_strings->SetString("createAccount", 165 localized_strings->SetString("createAccount",
164 l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_HTML)); 166 l10n_util::GetStringUTF16(IDS_CREATE_ACCOUNT_HTML));
165 localized_strings->SetString("guestSignin", 167 localized_strings->SetString("guestSignin",
166 l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_HTML)); 168 l10n_util::GetStringUTF16(IDS_BROWSE_WITHOUT_SIGNING_IN_HTML));
167 localized_strings->SetString("removeUser", 169 localized_strings->SetString("removeUser",
168 l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE)); 170 l10n_util::GetStringUTF16(IDS_LOGIN_REMOVE));
169 171
170 if (extension_driven_) 172 if (extension_driven_)
171 localized_strings->SetString("authType", "ext"); 173 localized_strings->SetString("authType", "ext");
172 else 174 else
(...skipping 309 matching lines...) Expand 10 before | Expand all | Expand 10 after
482 BrowsingDataRemover* remover = new BrowsingDataRemover( 484 BrowsingDataRemover* remover = new BrowsingDataRemover(
483 Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()), 485 Profile::FromBrowserContext(web_ui_->tab_contents()->browser_context()),
484 BrowsingDataRemover::EVERYTHING, 486 BrowsingDataRemover::EVERYTHING,
485 base::Time()); 487 base::Time());
486 remover->AddObserver(this); 488 remover->AddObserver(this);
487 remover->Remove(BrowsingDataRemover::REMOVE_COOKIES | 489 remover->Remove(BrowsingDataRemover::REMOVE_COOKIES |
488 BrowsingDataRemover::REMOVE_LSO_DATA); 490 BrowsingDataRemover::REMOVE_LSO_DATA);
489 } 491 }
490 492
491 } // namespace chromeos 493 } // namespace chromeos
OLDNEW
« no previous file with comments | « chrome/browser/resources/chromeos/login/screen_offline_message.js ('k') | chrome/chrome_renderer.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698