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

Side by Side Diff: chrome/browser/resources/options/personal_options.js

Issue 3532010: Add a pref checkbox to enable/disable screen lock for ChromeOs. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: firx chromeos trybot 2, set expectations Created 10 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 unified diff | Download patch
« no previous file with comments | « chrome/browser/resources/options/personal_options.html ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 cr.define('options', function() { 5 cr.define('options', function() {
6 6
7 var OptionsPage = options.OptionsPage; 7 var OptionsPage = options.OptionsPage;
8 8
9 // 9 //
10 // PersonalOptions class 10 // PersonalOptions class
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
87 } 87 }
88 88
89 if (cr.isMac || cr.isWindows || cr.isChromeOS) { 89 if (cr.isMac || cr.isWindows || cr.isChromeOS) {
90 $('themes_reset').onclick = function(event) { 90 $('themes_reset').onclick = function(event) {
91 chrome.send('themesReset'); 91 chrome.send('themesReset');
92 }; 92 };
93 $('themes-gallery').onclick = function(event) { 93 $('themes-gallery').onclick = function(event) {
94 chrome.send('themesGallery'); 94 chrome.send('themesGallery');
95 } 95 }
96 } 96 }
97
98 if (cr.isChromeOS) {
99 chrome.send('loadAccountPicture');
100 }
97 }, 101 },
98 102
99 syncStatusCallback_: function(statusString) { 103 syncStatusCallback_: function(statusString) {
100 $('synced_to_user_with_time').textContent = statusString; 104 $('synced_to_user_with_time').textContent = statusString;
101 }, 105 },
102 106
103 setGtkThemeButtonEnabled_: function(enabled) { 107 setGtkThemeButtonEnabled_: function(enabled) {
104 if (!cr.isChromeOS && navigator.platform.match(/linux|BSD/i)) { 108 if (!cr.isChromeOS && navigator.platform.match(/linux|BSD/i)) {
105 $('themes_GTK_button').disabled = !enabled; 109 $('themes_GTK_button').disabled = !enabled;
106 } 110 }
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
141 }; 145 };
142 146
143 PersonalOptions.setGtkThemeButtonEnabled = function(enabled) { 147 PersonalOptions.setGtkThemeButtonEnabled = function(enabled) {
144 PersonalOptions.getInstance().setGtkThemeButtonEnabled_(enabled); 148 PersonalOptions.getInstance().setGtkThemeButtonEnabled_(enabled);
145 }; 149 };
146 150
147 PersonalOptions.setClassicThemeButtonEnabled = function(enabled) { 151 PersonalOptions.setClassicThemeButtonEnabled = function(enabled) {
148 PersonalOptions.getInstance().setClassicThemeButtonEnabled_(enabled); 152 PersonalOptions.getInstance().setClassicThemeButtonEnabled_(enabled);
149 }; 153 };
150 154
155 PersonalOptions.setAccountPicture = function(image) {
156 $('account-picture').src = image;
157 }
158
151 // Export 159 // Export
152 return { 160 return {
153 PersonalOptions: PersonalOptions 161 PersonalOptions: PersonalOptions
154 }; 162 };
155 163
156 }); 164 });
157 165
OLDNEW
« no previous file with comments | « chrome/browser/resources/options/personal_options.html ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698