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

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

Issue 10885024: Integrate Chrome To Mobile with Action Box UI. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address cocoa comments. Created 8 years, 3 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 674 matching lines...) Expand 10 before | Expand all | Expand 10 after
685 kOsAll, 685 kOsAll,
686 SINGLE_VALUE_TYPE(switches::kEnableSuggestionsTabPage) 686 SINGLE_VALUE_TYPE(switches::kEnableSuggestionsTabPage)
687 }, 687 },
688 { 688 {
689 "enable-discovery-ntp", 689 "enable-discovery-ntp",
690 IDS_FLAGS_ENABLE_NTP_DISCOVERY_NAME, 690 IDS_FLAGS_ENABLE_NTP_DISCOVERY_NAME,
691 IDS_FLAGS_ENABLE_NTP_DISCOVERY_DESCRIPTION, 691 IDS_FLAGS_ENABLE_NTP_DISCOVERY_DESCRIPTION,
692 kOsAll, 692 kOsAll,
693 SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage) 693 SINGLE_VALUE_TYPE(switches::kEnableDiscoveryInNewTabPage)
694 }, 694 },
695 {
696 "disable-chrome-to-mobile", // FLAGS:RECORD_UMA
697 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_NAME,
698 IDS_FLAGS_DISABLE_CHROME_TO_MOBILE_DESCRIPTION,
699 kOsAll,
700 SINGLE_VALUE_TYPE(switches::kDisableChromeToMobile)
701 },
702 #if defined(GOOGLE_CHROME_BUILD) 695 #if defined(GOOGLE_CHROME_BUILD)
703 { 696 {
704 "disable-asynchronous-spellchecking", 697 "disable-asynchronous-spellchecking",
705 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING, 698 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING,
706 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING_DESCRIPTION, 699 IDS_FLAGS_DISABLE_ASYNCHRONOUS_SPELLCHECKING_DESCRIPTION,
707 kOsWin | kOsLinux | kOsCrOS, 700 kOsWin | kOsLinux | kOsCrOS,
708 SINGLE_VALUE_TYPE(switches::kDisableAsynchronousSpellChecking) 701 SINGLE_VALUE_TYPE(switches::kDisableAsynchronousSpellChecking)
709 }, 702 },
710 #endif 703 #endif
711 { 704 {
(...skipping 661 matching lines...) Expand 10 before | Expand all | Expand 10 after
1373 } 1366 }
1374 1367
1375 const Experiment* GetExperiments(size_t* count) { 1368 const Experiment* GetExperiments(size_t* count) {
1376 *count = num_experiments; 1369 *count = num_experiments;
1377 return experiments; 1370 return experiments;
1378 } 1371 }
1379 1372
1380 } // namespace testing 1373 } // namespace testing
1381 1374
1382 } // namespace about_flags 1375 } // namespace about_flags
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698