| OLD | NEW |
| 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/options2/browser_options_handler2.h" | 5 #include "chrome/browser/ui/webui/options2/browser_options_handler2.h" |
| 6 | 6 |
| 7 #include "base/basictypes.h" | 7 #include "base/basictypes.h" |
| 8 #include "base/bind.h" | 8 #include "base/bind.h" |
| 9 #include "base/bind_helpers.h" | 9 #include "base/bind_helpers.h" |
| 10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
| (...skipping 126 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 137 IDS_OPTIONS_STARTUP_SHOW_DEFAULT_AND_NEWTAB}, | 137 IDS_OPTIONS_STARTUP_SHOW_DEFAULT_AND_NEWTAB}, |
| 138 { "startupShowLastSession", IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION }, | 138 { "startupShowLastSession", IDS_OPTIONS_STARTUP_SHOW_LAST_SESSION }, |
| 139 { "startupShowPages", IDS_OPTIONS2_STARTUP_SHOW_PAGES }, | 139 { "startupShowPages", IDS_OPTIONS2_STARTUP_SHOW_PAGES }, |
| 140 { "syncSection", IDS_SYNC_OPTIONS_GROUP_NAME }, | 140 { "syncSection", IDS_SYNC_OPTIONS_GROUP_NAME }, |
| 141 { "themesGallery", IDS_THEMES_GALLERY_BUTTON }, | 141 { "themesGallery", IDS_THEMES_GALLERY_BUTTON }, |
| 142 { "themesGalleryURL", IDS_THEMES_GALLERY_URL }, | 142 { "themesGalleryURL", IDS_THEMES_GALLERY_URL }, |
| 143 { "toolbarGroupName", IDS_OPTIONS2_TOOLBAR_GROUP_NAME }, | 143 { "toolbarGroupName", IDS_OPTIONS2_TOOLBAR_GROUP_NAME }, |
| 144 { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR }, | 144 { "toolbarShowBookmarksBar", IDS_OPTIONS_TOOLBAR_SHOW_BOOKMARKS_BAR }, |
| 145 { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, | 145 { "toolbarShowHomeButton", IDS_OPTIONS_TOOLBAR_SHOW_HOME_BUTTON }, |
| 146 #if defined(TOOLKIT_GTK) | 146 #if defined(TOOLKIT_GTK) |
| 147 { "showWindowDecorations", IDS_SHOW_WINDOW_DECORATIONS }, |
| 147 { "themesGTKButton", IDS_THEMES_GTK_BUTTON }, | 148 { "themesGTKButton", IDS_THEMES_GTK_BUTTON }, |
| 148 { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, | 149 { "themesSetClassic", IDS_THEMES_SET_CLASSIC }, |
| 149 #else | 150 #else |
| 150 { "themes", IDS_THEMES_GROUP_NAME }, | 151 { "themes", IDS_THEMES_GROUP_NAME }, |
| 151 { "themesReset", IDS_THEMES_RESET_BUTTON }, | 152 { "themesReset", IDS_THEMES_RESET_BUTTON }, |
| 152 #endif | 153 #endif |
| 153 #if defined(OS_CHROMEOS) | 154 #if defined(OS_CHROMEOS) |
| 154 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE }, | 155 { "changePicture", IDS_OPTIONS_CHANGE_PICTURE }, |
| 155 { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX }, | 156 { "enableScreenlock", IDS_OPTIONS_ENABLE_SCREENLOCKER_CHECKBOX }, |
| 156 #endif | 157 #endif |
| (...skipping 603 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 760 if (!email.empty()) { | 761 if (!email.empty()) { |
| 761 web_ui()->CallJavascriptFunction("BrowserOptions.updateAccountPicture"); | 762 web_ui()->CallJavascriptFunction("BrowserOptions.updateAccountPicture"); |
| 762 base::StringValue email_value(email); | 763 base::StringValue email_value(email); |
| 763 web_ui()->CallJavascriptFunction("BrowserOptions.updateAccountPicture", | 764 web_ui()->CallJavascriptFunction("BrowserOptions.updateAccountPicture", |
| 764 email_value); | 765 email_value); |
| 765 } | 766 } |
| 766 } | 767 } |
| 767 #endif | 768 #endif |
| 768 | 769 |
| 769 } // namespace options2 | 770 } // namespace options2 |
| OLD | NEW |