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

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

Issue 11038021: Implement Chrome Extension TabCapture API. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 1 month 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 159 matching lines...) Expand 10 before | Expand all | Expand 10 after
170 }; 170 };
171 171
172 const Experiment::Choice kScriptBubbleChoices[] = { 172 const Experiment::Choice kScriptBubbleChoices[] = {
173 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 173 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
174 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED, 174 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
175 switches::kScriptBubble, "0"}, 175 switches::kScriptBubble, "0"},
176 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED, 176 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
177 switches::kScriptBubble, "1"} 177 switches::kScriptBubble, "1"}
178 }; 178 };
179 179
180 const Experiment::Choice kTabCaptureChoices[] = {
181 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
182 { IDS_GENERIC_EXPERIMENT_CHOICE_DISABLED,
183 switches::kTabCapture, "0"},
184 { IDS_GENERIC_EXPERIMENT_CHOICE_ENABLED,
185 switches::kTabCapture, "1"}
186 };
187
180 #if defined(OS_CHROMEOS) 188 #if defined(OS_CHROMEOS)
181 const Experiment::Choice kAshBootAnimationFunction[] = { 189 const Experiment::Choice kAshBootAnimationFunction[] = {
182 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" }, 190 { IDS_GENERIC_EXPERIMENT_CHOICE_DEFAULT, "", "" },
183 { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2, 191 { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION2,
184 ash::switches::kAshBootAnimationFunction2, ""}, 192 ash::switches::kAshBootAnimationFunction2, ""},
185 { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3, 193 { IDS_FLAGS_ASH_BOOT_ANIMATION_FUNCTION3,
186 ash::switches::kAshBootAnimationFunction3, ""} 194 ash::switches::kAshBootAnimationFunction3, ""}
187 }; 195 };
188 #endif 196 #endif
189 197
(...skipping 538 matching lines...) Expand 10 before | Expand all | Expand 10 after
728 kOsCrOS, 736 kOsCrOS,
729 SINGLE_VALUE_TYPE(switches::kEnableWebkitTextSubpixelPositioning) 737 SINGLE_VALUE_TYPE(switches::kEnableWebkitTextSubpixelPositioning)
730 }, 738 },
731 { 739 {
732 "enable-touch-events", 740 "enable-touch-events",
733 IDS_ENABLE_TOUCH_EVENTS_NAME, 741 IDS_ENABLE_TOUCH_EVENTS_NAME,
734 IDS_ENABLE_TOUCH_EVENTS_DESCRIPTION, 742 IDS_ENABLE_TOUCH_EVENTS_DESCRIPTION,
735 kOsWin | kOsMac | kOsLinux, 743 kOsWin | kOsMac | kOsLinux,
736 SINGLE_VALUE_TYPE(switches::kEnableTouchEvents) 744 SINGLE_VALUE_TYPE(switches::kEnableTouchEvents)
737 }, 745 },
746 {
747 "enable-tab-capture",
748 IDS_ENABLE_TAB_CAPTURE_NAME,
749 IDS_ENABLE_TAB_CAPTURE_DESCRIPTION,
750 kOsMac | kOsLinux,
751 MULTI_VALUE_TYPE(kTabCaptureChoices)
752 },
738 #if defined(OS_CHROMEOS) 753 #if defined(OS_CHROMEOS)
739 { 754 {
740 "enable-background-loader", 755 "enable-background-loader",
741 IDS_ENABLE_BACKLOADER_NAME, 756 IDS_ENABLE_BACKLOADER_NAME,
742 IDS_ENABLE_BACKLOADER_DESCRIPTION, 757 IDS_ENABLE_BACKLOADER_DESCRIPTION,
743 kOsCrOS, 758 kOsCrOS,
744 SINGLE_VALUE_TYPE(switches::kEnableBackgroundLoader) 759 SINGLE_VALUE_TYPE(switches::kEnableBackgroundLoader)
745 }, 760 },
746 { 761 {
747 "enable-bezel-touch", 762 "enable-bezel-touch",
(...skipping 687 matching lines...) Expand 10 before | Expand all | Expand 10 after
1435 } 1450 }
1436 1451
1437 const Experiment* GetExperiments(size_t* count) { 1452 const Experiment* GetExperiments(size_t* count) {
1438 *count = num_experiments; 1453 *count = num_experiments;
1439 return experiments; 1454 return experiments;
1440 } 1455 }
1441 1456
1442 } // namespace testing 1457 } // namespace testing
1443 1458
1444 } // namespace about_flags 1459 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/extensions/api/tab_capture/tab_capture_api.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698