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

Side by Side Diff: chrome/browser/ui/webui/options/browser_options_handler.cc

Issue 445003002: Supervised users: UI updates for new-profile-management launch. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: change label in profile list Created 6 years, 4 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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/options/browser_options_handler.h" 5 #include "chrome/browser/ui/webui/options/browser_options_handler.h"
6 6
7 #include <string> 7 #include <string>
8 #include <vector> 8 #include <vector>
9 9
10 #include "apps/app_window.h" 10 #include "apps/app_window.h"
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
332 { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS }, 332 { "showAdvancedSettings", IDS_SETTINGS_SHOW_ADVANCED_SETTINGS },
333 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT }, 333 { "spellingConfirmMessage", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_TEXT },
334 { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE }, 334 { "spellingConfirmEnable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_ENABLE },
335 { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE }, 335 { "spellingConfirmDisable", IDS_CONTENT_CONTEXT_SPELLING_BUBBLE_DISABLE },
336 { "spellingPref", IDS_OPTIONS_SPELLING_PREF }, 336 { "spellingPref", IDS_OPTIONS_SPELLING_PREF },
337 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION }, 337 { "startupRestoreLastSession", IDS_OPTIONS_STARTUP_RESTORE_LAST_SESSION },
338 { "startupSetPages", IDS_OPTIONS_STARTUP_SET_PAGES }, 338 { "startupSetPages", IDS_OPTIONS_STARTUP_SET_PAGES },
339 { "startupShowNewTab", IDS_OPTIONS_STARTUP_SHOW_NEWTAB }, 339 { "startupShowNewTab", IDS_OPTIONS_STARTUP_SHOW_NEWTAB },
340 { "startupShowPages", IDS_OPTIONS_STARTUP_SHOW_PAGES }, 340 { "startupShowPages", IDS_OPTIONS_STARTUP_SHOW_PAGES },
341 { "suggestPref", IDS_OPTIONS_SUGGEST_PREF }, 341 { "suggestPref", IDS_OPTIONS_SUGGEST_PREF },
342 { "supervisedUserLabel", IDS_SUPERVISED_USER_AVATAR_LABEL }, 342 { "supervisedUserLabel", IDS_PROFILES_LIST_SUPERVISED_USER_LABEL },
343 { "syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS }, 343 { "syncButtonTextInProgress", IDS_SYNC_NTP_SETUP_IN_PROGRESS },
344 { "syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL }, 344 { "syncButtonTextStop", IDS_SYNC_STOP_SYNCING_BUTTON_LABEL },
345 { "themesGallery", IDS_THEMES_GALLERY_BUTTON }, 345 { "themesGallery", IDS_THEMES_GALLERY_BUTTON },
346 { "themesGalleryURL", IDS_THEMES_GALLERY_URL }, 346 { "themesGalleryURL", IDS_THEMES_GALLERY_URL },
347 { "tabsToLinksPref", IDS_OPTIONS_TABS_TO_LINKS_PREF }, 347 { "tabsToLinksPref", IDS_OPTIONS_TABS_TO_LINKS_PREF },
348 { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR }, 348 { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR },
349 { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, 349 { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON },
350 { "translateEnableTranslate", 350 { "translateEnableTranslate",
351 IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE }, 351 IDS_OPTIONS_TRANSLATE_ENABLE_TRANSLATE },
352 #if defined(OS_LINUX) && !defined(OS_CHROMEOS) 352 #if defined(OS_LINUX) && !defined(OS_CHROMEOS)
(...skipping 1513 matching lines...) Expand 10 before | Expand all | Expand 10 after
1866 extension = extensions::GetExtensionOverridingProxy( 1866 extension = extensions::GetExtensionOverridingProxy(
1867 Profile::FromWebUI(web_ui())); 1867 Profile::FromWebUI(web_ui()));
1868 AppendExtensionData("proxy", extension, &extension_controlled); 1868 AppendExtensionData("proxy", extension, &extension_controlled);
1869 1869
1870 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators", 1870 web_ui()->CallJavascriptFunction("BrowserOptions.toggleExtensionIndicators",
1871 extension_controlled); 1871 extension_controlled);
1872 #endif // defined(OS_WIN) 1872 #endif // defined(OS_WIN)
1873 } 1873 }
1874 1874
1875 } // namespace options 1875 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698