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

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

Issue 2121303003: Remove the "Settings" packaged app (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 5 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
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 <stddef.h> 7 #include <stddef.h>
8 8
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 519 matching lines...) Expand 10 before | Expand all | Expand 10 after
530 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS) 530 #endif // defined(OS_LINUX) && !defined(OS_CHROMEOS)
531 531
532 #if defined(OS_CHROMEOS) && defined(USE_ASH) 532 #if defined(OS_CHROMEOS) && defined(USE_ASH)
533 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON }, 533 { "setWallpaper", IDS_SET_WALLPAPER_BUTTON },
534 #endif // defined(OS_CHROMEOS) && defined(USE_ASH) 534 #endif // defined(OS_CHROMEOS) && defined(USE_ASH)
535 535
536 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS) 536 #if !defined(OS_MACOSX) && !defined(OS_CHROMEOS)
537 { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE }, 537 { "backgroundModeCheckbox", IDS_OPTIONS_SYSTEM_ENABLE_BACKGROUND_MODE },
538 #endif // defined(OS_MACOSX) && !defined(OS_CHROMEOS) 538 #endif // defined(OS_MACOSX) && !defined(OS_CHROMEOS)
539 539
540 #if defined(ENABLE_SETTINGS_APP)
541 { "profilesAppListSwitch", IDS_SETTINGS_APP_PROFILES_SWITCH_BUTTON_LABEL },
542 #endif // defined(ENABLE_SETTINGS_APP)
543
544 #if defined(ENABLE_SERVICE_DISCOVERY) 540 #if defined(ENABLE_SERVICE_DISCOVERY)
545 { "cloudPrintDevicesPageButton", IDS_LOCAL_DISCOVERY_DEVICES_PAGE_BUTTON }, 541 { "cloudPrintDevicesPageButton", IDS_LOCAL_DISCOVERY_DEVICES_PAGE_BUTTON },
546 { "cloudPrintEnableNotificationsLabel", 542 { "cloudPrintEnableNotificationsLabel",
547 IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL }, 543 IDS_LOCAL_DISCOVERY_NOTIFICATIONS_ENABLE_CHECKBOX_LABEL },
548 #endif // defined(ENABLE_SERVICE_DISCOVERY) 544 #endif // defined(ENABLE_SERVICE_DISCOVERY)
549 }; 545 };
550 546
551 #if defined(ENABLE_SETTINGS_APP)
552 static OptionsStringResource app_resources[] = {
553 { "syncOverview", IDS_SETTINGS_APP_SYNC_OVERVIEW },
554 { "syncButtonTextStart", IDS_SYNC_START_SYNC_BUTTON_LABEL,
555 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
556 { "profilesSingleUser", IDS_PROFILES_SINGLE_USER_MESSAGE,
557 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
558 { "languageSectionLabel", IDS_OPTIONS_ADVANCED_LANGUAGE_LABEL,
559 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
560 { "proxiesLabelSystem", IDS_OPTIONS_SYSTEM_PROXIES_LABEL,
561 IDS_SETTINGS_APP_LAUNCHER_PRODUCT_NAME },
562 };
563 base::DictionaryValue* app_values = NULL;
564 CHECK(values->GetDictionary(kSettingsAppKey, &app_values));
565 RegisterStrings(app_values, app_resources, arraysize(app_resources));
566 #endif
567
568 RegisterStrings(values, resources, arraysize(resources)); 547 RegisterStrings(values, resources, arraysize(resources));
569 RegisterTitle(values, "doNotTrackConfirmOverlay", 548 RegisterTitle(values, "doNotTrackConfirmOverlay",
570 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE); 549 IDS_OPTIONS_ENABLE_DO_NOT_TRACK_BUBBLE_TITLE);
571 RegisterTitle(values, "spellingConfirmOverlay", 550 RegisterTitle(values, "spellingConfirmOverlay",
572 IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE); 551 IDS_CONTENT_CONTEXT_SPELLING_ASK_GOOGLE);
573 #if defined(ENABLE_PRINT_PREVIEW) 552 #if defined(ENABLE_PRINT_PREVIEW)
574 RegisterCloudPrintValues(values); 553 RegisterCloudPrintValues(values);
575 #endif 554 #endif
576 555
577 values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL); 556 values->SetString("syncLearnMoreURL", chrome::kSyncLearnMoreURL);
(...skipping 1650 matching lines...) Expand 10 before | Expand all | Expand 10 after
2228 2207
2229 bool BrowserOptionsHandler::IsDeviceOwnerProfile() { 2208 bool BrowserOptionsHandler::IsDeviceOwnerProfile() {
2230 #if defined(OS_CHROMEOS) 2209 #if defined(OS_CHROMEOS)
2231 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui())); 2210 return chromeos::ProfileHelper::IsOwnerProfile(Profile::FromWebUI(web_ui()));
2232 #else 2211 #else
2233 return true; 2212 return true;
2234 #endif 2213 #endif
2235 } 2214 }
2236 2215
2237 } // namespace options 2216 } // namespace options
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698