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

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

Issue 1965073002: Rename gfx::Display to display::Display (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: rebase Created 4 years, 7 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
« no previous file with comments | « ash/wm/common/wm_window.h ('k') | chrome/browser/apps/guest_view/web_view_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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 823 matching lines...) Expand 10 before | Expand all | Expand 10 after
834 IDS_FLAGS_OFFICE_EDITING_COMPONENT_APP_NAME, 834 IDS_FLAGS_OFFICE_EDITING_COMPONENT_APP_NAME,
835 IDS_FLAGS_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION, kOsCrOS, 835 IDS_FLAGS_OFFICE_EDITING_COMPONENT_APP_DESCRIPTION, kOsCrOS,
836 SINGLE_DISABLE_VALUE_TYPE( 836 SINGLE_DISABLE_VALUE_TYPE(
837 chromeos::switches::kDisableOfficeEditingComponentApp), 837 chromeos::switches::kDisableOfficeEditingComponentApp),
838 }, 838 },
839 { 839 {
840 "disable-display-color-calibration", 840 "disable-display-color-calibration",
841 IDS_FLAGS_DISPLAY_COLOR_CALIBRATION_NAME, 841 IDS_FLAGS_DISPLAY_COLOR_CALIBRATION_NAME,
842 IDS_FLAGS_DISPLAY_COLOR_CALIBRATION_DESCRIPTION, kOsCrOS, 842 IDS_FLAGS_DISPLAY_COLOR_CALIBRATION_DESCRIPTION, kOsCrOS,
843 SINGLE_DISABLE_VALUE_TYPE( 843 SINGLE_DISABLE_VALUE_TYPE(
844 ui::switches::kDisableDisplayColorCalibration), 844 ::switches::kDisableDisplayColorCalibration),
845 }, 845 },
846 { 846 {
847 "disable-quirks-client", IDS_FLAGS_DISABLE_QUIRKS_CLIENT_NAME, 847 "disable-quirks-client", IDS_FLAGS_DISABLE_QUIRKS_CLIENT_NAME,
848 IDS_FLAGS_DISABLE_QUIRKS_CLIENT_DESCRIPTION, kOsCrOS, 848 IDS_FLAGS_DISABLE_QUIRKS_CLIENT_DESCRIPTION, kOsCrOS,
849 SINGLE_VALUE_TYPE(quirks::switches::kDisableQuirksClient), 849 SINGLE_VALUE_TYPE(quirks::switches::kDisableQuirksClient),
850 }, 850 },
851 { 851 {
852 "ash-disable-screen-orientation-lock", 852 "ash-disable-screen-orientation-lock",
853 IDS_FLAGS_ASH_SCREEN_ORIENTATION_LOCK_NAME, 853 IDS_FLAGS_ASH_SCREEN_ORIENTATION_LOCK_NAME,
854 IDS_FLAGS_ASH_SCREEN_ORIENTATION_LOCK_DESCRIPTION, kOsCrOS, 854 IDS_FLAGS_ASH_SCREEN_ORIENTATION_LOCK_DESCRIPTION, kOsCrOS,
(...skipping 1212 matching lines...) Expand 10 before | Expand all | Expand 10 after
2067 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0; 2067 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
2068 2068
2069 const FeatureEntry* GetFeatureEntries(size_t* count) { 2069 const FeatureEntry* GetFeatureEntries(size_t* count) {
2070 *count = arraysize(kFeatureEntries); 2070 *count = arraysize(kFeatureEntries);
2071 return kFeatureEntries; 2071 return kFeatureEntries;
2072 } 2072 }
2073 2073
2074 } // namespace testing 2074 } // namespace testing
2075 2075
2076 } // namespace about_flags 2076 } // namespace about_flags
OLDNEW
« no previous file with comments | « ash/wm/common/wm_window.h ('k') | chrome/browser/apps/guest_view/web_view_browsertest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698