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

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

Issue 11343028: Revert 164652 - speculative revert - this change may have caused print dialog test failures on XP. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: 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
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/prefs/pref_service_browsertest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 612 matching lines...) Expand 10 before | Expand all | Expand 10 after
623 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia) 623 SINGLE_VALUE_TYPE(switches::kEnableEncryptedMedia)
624 }, 624 },
625 #if defined(USE_ASH) 625 #if defined(USE_ASH)
626 { 626 {
627 "aura-google-dialog-frames", 627 "aura-google-dialog-frames",
628 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME, 628 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_NAME,
629 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION, 629 IDS_FLAGS_AURA_GOOGLE_DIALOG_FRAMES_DESCRIPTION,
630 kOsWin | kOsLinux | kOsCrOS, 630 kOsWin | kOsLinux | kOsCrOS,
631 SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames) 631 SINGLE_VALUE_TYPE(ash::switches::kAuraGoogleDialogFrames)
632 }, 632 },
633 {
634 "ash-disable-auto-window-placement",
635 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_NAME,
636 IDS_FLAGS_ASH_AUTO_WINDOW_PLACEMENT_DESCRIPTION,
637 kOsWin | kOsLinux | kOsCrOS,
638 SINGLE_VALUE_TYPE(ash::switches::kAshDisableAutoWindowPlacement)
639 },
640 #endif 633 #endif
641 { 634 {
642 "per-tile-painting", 635 "per-tile-painting",
643 IDS_FLAGS_PER_TILE_PAINTING_NAME, 636 IDS_FLAGS_PER_TILE_PAINTING_NAME,
644 IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION, 637 IDS_FLAGS_PER_TILE_PAINTING_DESCRIPTION,
645 #if defined(USE_SKIA) 638 #if defined(USE_SKIA)
646 kOsMac | kOsLinux | kOsCrOS, 639 kOsMac | kOsLinux | kOsCrOS,
647 #else 640 #else
648 0, 641 0,
649 #endif 642 #endif
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
1499 } 1492 }
1500 1493
1501 const Experiment* GetExperiments(size_t* count) { 1494 const Experiment* GetExperiments(size_t* count) {
1502 *count = num_experiments; 1495 *count = num_experiments;
1503 return experiments; 1496 return experiments;
1504 } 1497 }
1505 1498
1506 } // namespace testing 1499 } // namespace testing
1507 1500
1508 } // namespace about_flags 1501 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/prefs/pref_service_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698