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

Side by Side Diff: chrome/browser/about_flags.cc

Issue 12680004: Remove chrome/ code to handle App Notifications (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix merge conflicts. Created 7 years, 9 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/about_flags.h" 5 #include "chrome/browser/about_flags.h"
6 6
7 #include <algorithm> 7 #include <algorithm>
8 #include <iterator> 8 #include <iterator>
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 SINGLE_VALUE_TYPE(switches::kShowAutofillTypePredictions) 553 SINGLE_VALUE_TYPE(switches::kShowAutofillTypePredictions)
554 }, 554 },
555 { 555 {
556 "sync-tab-favicons", 556 "sync-tab-favicons",
557 IDS_FLAGS_SYNC_TAB_FAVICONS_NAME, 557 IDS_FLAGS_SYNC_TAB_FAVICONS_NAME,
558 IDS_FLAGS_SYNC_TAB_FAVICONS_DESCRIPTION, 558 IDS_FLAGS_SYNC_TAB_FAVICONS_DESCRIPTION,
559 kOsAll, 559 kOsAll,
560 SINGLE_VALUE_TYPE(switches::kSyncTabFavicons) 560 SINGLE_VALUE_TYPE(switches::kSyncTabFavicons)
561 }, 561 },
562 { 562 {
563 "sync-app-notifications",
564 IDS_FLAGS_SYNC_APP_NOTIFICATIONS_NAME,
565 IDS_FLAGS_SYNC_APP_NOTIFICATIONS_DESCRIPTION,
566 kOsDesktop,
567 SINGLE_VALUE_TYPE(switches::kDisableSyncAppNotifications)
568 },
569 {
570 "sync-keystore-encryption", 563 "sync-keystore-encryption",
571 IDS_FLAGS_SYNC_KEYSTORE_ENCRYPTION_NAME, 564 IDS_FLAGS_SYNC_KEYSTORE_ENCRYPTION_NAME,
572 IDS_FLAGS_SYNC_KEYSTORE_ENCRYPTION_DESCRIPTION, 565 IDS_FLAGS_SYNC_KEYSTORE_ENCRYPTION_DESCRIPTION,
573 kOsAll, 566 kOsAll,
574 SINGLE_VALUE_TYPE(switches::kSyncKeystoreEncryption) 567 SINGLE_VALUE_TYPE(switches::kSyncKeystoreEncryption)
575 }, 568 },
576 { 569 {
577 "enable-gesture-tap-highlight", 570 "enable-gesture-tap-highlight",
578 IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_NAME, 571 IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_NAME,
579 IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_DESCRIPTION, 572 IDS_FLAGS_ENABLE_GESTURE_TAP_HIGHLIGHTING_DESCRIPTION,
(...skipping 1231 matching lines...) Expand 10 before | Expand all | Expand 10 after
1811 } 1804 }
1812 1805
1813 const Experiment* GetExperiments(size_t* count) { 1806 const Experiment* GetExperiments(size_t* count) {
1814 *count = num_experiments; 1807 *count = num_experiments;
1815 return experiments; 1808 return experiments;
1816 } 1809 }
1817 1810
1818 } // namespace testing 1811 } // namespace testing
1819 1812
1820 } // namespace about_flags 1813 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/theme/theme_resources.grd ('k') | chrome/browser/automation/automation_provider_observers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698