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

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

Issue 820513002: Renamed WorkerFrame to SurfaceWorker (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fixed tests Created 6 years 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 | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.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 1420 matching lines...) Expand 10 before | Expand all | Expand 10 after
1431 // TODO(mgiuca): Remove the #if when Aura is the default on Linux. 1431 // TODO(mgiuca): Remove the #if when Aura is the default on Linux.
1432 "enable-app-list", 1432 "enable-app-list",
1433 IDS_FLAGS_ENABLE_APP_LIST_NAME, 1433 IDS_FLAGS_ENABLE_APP_LIST_NAME,
1434 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION, 1434 IDS_FLAGS_ENABLE_APP_LIST_DESCRIPTION,
1435 kOsLinux, 1435 kOsLinux,
1436 SINGLE_VALUE_TYPE(switches::kEnableAppList) 1436 SINGLE_VALUE_TYPE(switches::kEnableAppList)
1437 }, 1437 },
1438 #endif 1438 #endif
1439 #if defined(ENABLE_EXTENSIONS) 1439 #if defined(ENABLE_EXTENSIONS)
1440 { 1440 {
1441 "enable-worker-frame", 1441 "enable-surface-worker",
1442 IDS_FLAGS_ENABLE_WORKER_FRAME_NAME, 1442 IDS_FLAGS_ENABLE_SURFACE_WORKER_NAME,
1443 IDS_FLAGS_ENABLE_WORKER_FRAME_DESCRIPTION, 1443 IDS_FLAGS_ENABLE_SURFACE_WORKER_DESCRIPTION,
1444 kOsDesktop, 1444 kOsDesktop,
1445 SINGLE_VALUE_TYPE(extensions::switches::kEnableWorkerFrame) 1445 SINGLE_VALUE_TYPE(extensions::switches::kEnableSurfaceWorker)
1446 }, 1446 },
1447 #endif 1447 #endif
1448 { 1448 {
1449 "disable-app-list-app-info", 1449 "disable-app-list-app-info",
1450 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST, 1450 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST,
1451 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION, 1451 IDS_FLAGS_DISABLE_APP_INFO_IN_APP_LIST_DESCRIPTION,
1452 kOsLinux | kOsWin | kOsCrOS, 1452 kOsLinux | kOsWin | kOsCrOS,
1453 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo) 1453 SINGLE_VALUE_TYPE(app_list::switches::kDisableAppInfo)
1454 }, 1454 },
1455 { 1455 {
(...skipping 1187 matching lines...) Expand 10 before | Expand all | Expand 10 after
2643 } 2643 }
2644 2644
2645 const Experiment* GetExperiments(size_t* count) { 2645 const Experiment* GetExperiments(size_t* count) {
2646 *count = num_experiments; 2646 *count = num_experiments;
2647 return experiments; 2647 return experiments;
2648 } 2648 }
2649 2649
2650 } // namespace testing 2650 } // namespace testing
2651 2651
2652 } // namespace about_flags 2652 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/chrome_content_browser_client.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698