summaryrefslogtreecommitdiffstats
path: root/chrome/browser/resources
diff options
context:
space:
mode:
authorjhawkins@google.com <jhawkins@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 23:25:50 +0000
committerjhawkins@google.com <jhawkins@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2010-12-13 23:25:50 +0000
commit161888b0b684e032f82045cfa2ccced19390fc1e (patch)
tree6472e579b3bb774e950dc2e4fcc1bcfcf038e15e /chrome/browser/resources
parentc1aede0b5089e4616804c1aec1819b28c8cd6ac8 (diff)
downloadchromium_src-161888b0b684e032f82045cfa2ccced19390fc1e.zip
chromium_src-161888b0b684e032f82045cfa2ccced19390fc1e.tar.gz
chromium_src-161888b0b684e032f82045cfa2ccced19390fc1e.tar.bz2
DOMUI: Rename PasswordsException* to PasswordManager*.
BUG=59282 TEST=none Review URL: http://codereview.chromium.org/5810002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69065 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/browser/resources')
-rw-r--r--chrome/browser/resources/options/options.html8
-rw-r--r--chrome/browser/resources/options/options.js4
-rw-r--r--chrome/browser/resources/options/password_manager.html (renamed from chrome/browser/resources/options/passwords_exceptions.html)4
-rw-r--r--chrome/browser/resources/options/password_manager.js (renamed from chrome/browser/resources/options/passwords_exceptions.js)43
-rw-r--r--chrome/browser/resources/options/password_manager_list.css (renamed from chrome/browser/resources/options/passwords_exceptions_list.css)0
-rw-r--r--chrome/browser/resources/options/password_manager_list.js (renamed from chrome/browser/resources/options/passwords_exceptions_list.js)12
-rw-r--r--chrome/browser/resources/options/personal_options.js6
7 files changed, 39 insertions, 38 deletions
diff --git a/chrome/browser/resources/options/options.html b/chrome/browser/resources/options/options.html
index 568ac09..ce16967 100644
--- a/chrome/browser/resources/options/options.html
+++ b/chrome/browser/resources/options/options.html
@@ -24,7 +24,7 @@
<link rel="stylesheet" href="content_settings_exceptions_area.css">
<link rel="stylesheet" href="cookies_view.css">
<link rel="stylesheet" href="edit_search_engine_overlay.css">
-<link rel="stylesheet" href="passwords_exceptions_list.css">
+<link rel="stylesheet" href="password_manager_list.css">
<link rel="stylesheet" href="personal_options.css">
<link rel="stylesheet" href="import_data_overlay.css">
<link rel="stylesheet" href="search_engine_manager.css">
@@ -120,8 +120,8 @@
<script src="font_settings_ui.js"></script>
<script src="import_data_overlay.js"></script>
<script src="instant_confirm_overlay.js"></script>
-<script src="passwords_exceptions.js"></script>
-<script src="passwords_exceptions_list.js"></script>
+<script src="password_manager.js"></script>
+<script src="password_manager_list.js"></script>
<script src="personal_options.js"></script>
<script src="search_engine_manager.js"></script>
<script src="search_engine_manager_engine_list.js"></script>
@@ -200,7 +200,7 @@
<include src="content_settings.html">
<include src="cookies_view.html">
<include src="font_settings.html">
- <include src="passwords_exceptions.html">
+ <include src="password_manager.html">
<include src="search_engine_manager.html">
<include src="startup_page_manager.html">
</div>
diff --git a/chrome/browser/resources/options/options.js b/chrome/browser/resources/options/options.js
index 6bebb94..8ba7dd5 100644
--- a/chrome/browser/resources/options/options.js
+++ b/chrome/browser/resources/options/options.js
@@ -17,7 +17,7 @@ var FontSettings = options.FontSettings;
var ImportDataOverlay = options.ImportDataOverlay;
var InstantConfirmOverlay = options.InstantConfirmOverlay;
var OptionsPage = options.OptionsPage;
-var PasswordsExceptions = options.PasswordsExceptions;
+var PasswordManager = options.PasswordManager;
var PersonalOptions = options.PersonalOptions;
var Preferences = options.Preferences;
var ProxyOptions = options.ProxyOptions;
@@ -58,7 +58,7 @@ function load() {
OptionsPage.register(PersonalOptions.getInstance());
OptionsPage.registerSubPage(AutoFillOptions.getInstance(),
PersonalOptions.getInstance());
- OptionsPage.registerSubPage(PasswordsExceptions.getInstance(),
+ OptionsPage.registerSubPage(PasswordManager.getInstance(),
PersonalOptions.getInstance());
if (cr.isChromeOS) {
OptionsPage.register(SystemOptions.getInstance());
diff --git a/chrome/browser/resources/options/passwords_exceptions.html b/chrome/browser/resources/options/password_manager.html
index c75f715..5d80093 100644
--- a/chrome/browser/resources/options/passwords_exceptions.html
+++ b/chrome/browser/resources/options/password_manager.html
@@ -1,5 +1,5 @@
-<div class="page hidden" id="passwordsExceptionsPage">
- <h1 i18n-content="savedPasswordsExceptionsTitle"></h1>
+<div id="passwordManager" class="page hidden">
+ <h1 i18n-content="savedPasswordsTitle"></h1>
<!-- Navigation tabs -->
<div class="subpages-nav-tabs">
diff --git a/chrome/browser/resources/options/passwords_exceptions.js b/chrome/browser/resources/options/password_manager.js
index f325b1d0..0ec93b7 100644
--- a/chrome/browser/resources/options/passwords_exceptions.js
+++ b/chrome/browser/resources/options/password_manager.js
@@ -7,29 +7,30 @@ cr.define('options', function() {
var OptionsPage = options.OptionsPage;
/////////////////////////////////////////////////////////////////////////////
- // PasswordsExceptions class:
+ // PasswordManager class:
/**
* Encapsulated handling of password and exceptions page.
* @constructor
*/
- function PasswordsExceptions() {
+ function PasswordManager() {
this.activeNavTab = null;
- OptionsPage.call(this, 'passwordsExceptions',
- templateData.savedPasswordsExceptionsTitle,
- 'passwordsExceptionsPage');
+ OptionsPage.call(this,
+ 'passwordManager',
+ templateData.savedPasswordsTitle,
+ 'passwordManager');
}
- cr.addSingletonGetter(PasswordsExceptions);
+ cr.addSingletonGetter(PasswordManager);
- PasswordsExceptions.prototype = {
+ PasswordManager.prototype = {
__proto__: OptionsPage.prototype,
initializePage: function() {
OptionsPage.prototype.initializePage.call(this);
- options.passwordsExceptions.PasswordsListArea.decorate($('passwordsArea'));
- options.passwordsExceptions.PasswordExceptionsListArea.decorate(
+ options.passwordManager.PasswordsListArea.decorate($('passwordsArea'));
+ options.passwordManager.PasswordExceptionsListArea.decorate(
$('passwordExceptionsArea'));
$('password-exceptions-nav-tab').onclick = function() {
@@ -54,7 +55,7 @@ cr.define('options', function() {
};
- PasswordsExceptions.load = function() {
+ PasswordManager.load = function() {
chrome.send('loadLists');
};
@@ -62,7 +63,7 @@ cr.define('options', function() {
* Call to remove a saved password.
* @param rowIndex indicating the row to remove.
*/
- PasswordsExceptions.removeSavedPassword = function(rowIndex) {
+ PasswordManager.removeSavedPassword = function(rowIndex) {
chrome.send('removeSavedPassword', [String(rowIndex)]);
};
@@ -70,7 +71,7 @@ cr.define('options', function() {
* Call to remove a password exception.
* @param rowIndex indicating the row to remove.
*/
- PasswordsExceptions.removePasswordException = function(rowIndex) {
+ PasswordManager.removePasswordException = function(rowIndex) {
chrome.send('removePasswordException', [String(rowIndex)]);
};
@@ -79,7 +80,7 @@ cr.define('options', function() {
* Call to remove all saved passwords.
* @param tab contentType of the tab currently on.
*/
- PasswordsExceptions.removeAllPasswords = function() {
+ PasswordManager.removeAllPasswords = function() {
chrome.send('removeAllSavedPasswords');
};
@@ -87,29 +88,29 @@ cr.define('options', function() {
* Call to remove all saved passwords.
* @param tab contentType of the tab currently on.
*/
- PasswordsExceptions.removeAllPasswordExceptions = function() {
+ PasswordManager.removeAllPasswordExceptions = function() {
chrome.send('removeAllPasswordExceptions');
};
- PasswordsExceptions.showSelectedPassword = function(index) {
+ PasswordManager.showSelectedPassword = function(index) {
chrome.send('showSelectedPassword', [String(index)]);
};
- PasswordsExceptions.setSavedPasswordsList = function(entries) {
- PasswordsExceptions.getInstance().setSavedPasswordsList_(entries);
+ PasswordManager.setSavedPasswordsList = function(entries) {
+ PasswordManager.getInstance().setSavedPasswordsList_(entries);
};
- PasswordsExceptions.setPasswordExceptionsList = function(entries) {
- PasswordsExceptions.getInstance().setPasswordExceptionsList_(entries);
+ PasswordManager.setPasswordExceptionsList = function(entries) {
+ PasswordManager.getInstance().setPasswordExceptionsList_(entries);
};
- PasswordsExceptions.selectedPasswordCallback = function(password) {
+ PasswordManager.selectedPasswordCallback = function(password) {
passwordsArea.displayReturnedPassword(password);
};
// Export
return {
- PasswordsExceptions: PasswordsExceptions
+ PasswordManager: PasswordManager
};
});
diff --git a/chrome/browser/resources/options/passwords_exceptions_list.css b/chrome/browser/resources/options/password_manager_list.css
index c62adbe..c62adbe 100644
--- a/chrome/browser/resources/options/passwords_exceptions_list.css
+++ b/chrome/browser/resources/options/password_manager_list.css
diff --git a/chrome/browser/resources/options/passwords_exceptions_list.js b/chrome/browser/resources/options/password_manager_list.js
index 2121976..c814fe5 100644
--- a/chrome/browser/resources/options/passwords_exceptions_list.js
+++ b/chrome/browser/resources/options/password_manager_list.js
@@ -2,7 +2,7 @@
// Use of this source code is governed by a BSD-style license that can be
// found in the LICENSE file.
-cr.define('options.passwordsExceptions', function() {
+cr.define('options.passwordManager', function() {
const List = cr.ui.List;
const ListItem = cr.ui.ListItem;
@@ -160,12 +160,12 @@ cr.define('options.passwordsExceptions', function() {
*/
removeSelectedRow: function() {
var selectedIndex = this.selectionModel.selectedIndex;
- PasswordsExceptions.removeSavedPassword(selectedIndex);
+ PasswordManager.removeSavedPassword(selectedIndex);
},
showSelectedPassword: function() {
var selectedIndex = this.selectionModel.selectedIndex;
- PasswordsExceptions.showSelectedPassword(selectedIndex);
+ PasswordManager.showSelectedPassword(selectedIndex);
},
/**
@@ -224,7 +224,7 @@ cr.define('options.passwordsExceptions', function() {
*/
removeSelectedRow: function() {
var selectedIndex = this.selectionModel.selectedIndex;
- PasswordsExceptions.removePasswordException(selectedIndex);
+ PasswordManager.removePasswordException(selectedIndex);
},
/**
@@ -284,7 +284,7 @@ cr.define('options.passwordsExceptions', function() {
localStrings.getString('passwordsRemoveAllWarning'),
localStrings.getString('yesButtonLabel'),
localStrings.getString('noButtonLabel'),
- function() { PasswordsExceptions.removeAllPasswords(); });
+ function() { PasswordManager.removeAllPasswords(); });
};
showHidePassword.onclick = function(event) {
@@ -362,7 +362,7 @@ cr.define('options.passwordsExceptions', function() {
};
removeAll.onclick = function(event) {
- PasswordsExceptions.removeAllPasswordExceptions();
+ PasswordManager.removeAllPasswordExceptions();
};
this.updateButtonSensitivity();
diff --git a/chrome/browser/resources/options/personal_options.js b/chrome/browser/resources/options/personal_options.js
index 859636a..19678cd 100644
--- a/chrome/browser/resources/options/personal_options.js
+++ b/chrome/browser/resources/options/personal_options.js
@@ -44,11 +44,11 @@ cr.define('options', function() {
chrome.send('openPrivacyDashboardTabAndActivate');
};
$('manage-passwords').onclick = function(event) {
- PasswordsExceptions.load();
- OptionsPage.showPageByName('passwordsExceptions');
+ PasswordManager.load();
+ OptionsPage.showPageByName('passwordManager');
OptionsPage.showTab($('passwords-nav-tab'));
chrome.send('coreOptionsUserMetricsAction',
- ['Options_ShowPasswordsExceptions']);
+ ['Options_ShowPasswordManager']);
};
$('autofill-settings').onclick = function(event) {
OptionsPage.showPageByName('autoFillOptions');