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

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

Issue 64803005: File association for app shims. (Mac) (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Missed a comma. Created 6 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 | Annotate | Revision Log
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/web_applications/web_app.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 1778 matching lines...) Expand 10 before | Expand all | Expand 10 after
1789 kOsAll, 1789 kOsAll,
1790 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) 1790 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin)
1791 }, 1791 },
1792 #if defined(OS_MACOSX) 1792 #if defined(OS_MACOSX)
1793 { 1793 {
1794 "apps-keep-chrome-alive", 1794 "apps-keep-chrome-alive",
1795 IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_NAME, 1795 IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_NAME,
1796 IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_DESCRIPTION, 1796 IDS_FLAGS_APPS_KEEP_CHROME_ALIVE_DESCRIPTION,
1797 kOsMac, 1797 kOsMac,
1798 SINGLE_VALUE_TYPE(switches::kAppsKeepChromeAlive) 1798 SINGLE_VALUE_TYPE(switches::kAppsKeepChromeAlive)
1799 } 1799 },
1800 #endif 1800 #endif
1801 {
1802 "enable-apps-file-associations",
1803 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME,
1804 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION,
1805 kOsMac,
1806 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations)
1807 },
1801 }; 1808 };
1802 1809
1803 const Experiment* experiments = kExperiments; 1810 const Experiment* experiments = kExperiments;
1804 size_t num_experiments = arraysize(kExperiments); 1811 size_t num_experiments = arraysize(kExperiments);
1805 1812
1806 // Stores and encapsulates the little state that about:flags has. 1813 // Stores and encapsulates the little state that about:flags has.
1807 class FlagsState { 1814 class FlagsState {
1808 public: 1815 public:
1809 FlagsState() : needs_restart_(false) {} 1816 FlagsState() : needs_restart_(false) {}
1810 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, 1817 void ConvertFlagsToSwitches(FlagsStorage* flags_storage,
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
2315 } 2322 }
2316 2323
2317 const Experiment* GetExperiments(size_t* count) { 2324 const Experiment* GetExperiments(size_t* count) {
2318 *count = num_experiments; 2325 *count = num_experiments;
2319 return experiments; 2326 return experiments;
2320 } 2327 }
2321 2328
2322 } // namespace testing 2329 } // namespace testing
2323 2330
2324 } // namespace about_flags 2331 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | chrome/browser/web_applications/web_app.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698