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

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

Issue 181493011: Windows: Automatically associate file types with Chrome apps. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Respond to Jack's comments. Created 6 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 <iterator> 7 #include <iterator>
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <utility> 10 #include <utility>
(...skipping 1802 matching lines...) Expand 10 before | Expand all | Expand 10 after
1813 "allow-insecure-websocket-from-https-origin", 1813 "allow-insecure-websocket-from-https-origin",
1814 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME, 1814 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME,
1815 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION, 1815 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION,
1816 kOsAll, 1816 kOsAll,
1817 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin) 1817 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin)
1818 }, 1818 },
1819 { 1819 {
1820 "enable-apps-file-associations", 1820 "enable-apps-file-associations",
1821 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME, 1821 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_NAME,
1822 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION, 1822 IDS_FLAGS_ENABLE_APPS_FILE_ASSOCIATIONS_DESCRIPTION,
1823 kOsMac, 1823 kOsWin | kOsMac,
1824 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations) 1824 SINGLE_VALUE_TYPE(switches::kEnableAppsFileAssociations)
1825 }, 1825 },
1826 #if defined(OS_ANDROID) 1826 #if defined(OS_ANDROID)
1827 { 1827 {
1828 "enable-embeddedsearch-api", 1828 "enable-embeddedsearch-api",
1829 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME, 1829 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_NAME,
1830 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION, 1830 IDS_FLAGS_ENABLE_EMBEDDEDSEARCH_API_DESCRIPTION,
1831 kOsAndroid, 1831 kOsAndroid,
1832 SINGLE_VALUE_TYPE(switches::kEnableEmbeddedSearchAPI) 1832 SINGLE_VALUE_TYPE(switches::kEnableEmbeddedSearchAPI)
1833 }, 1833 },
(...skipping 763 matching lines...) Expand 10 before | Expand all | Expand 10 after
2597 } 2597 }
2598 2598
2599 const Experiment* GetExperiments(size_t* count) { 2599 const Experiment* GetExperiments(size_t* count) {
2600 *count = num_experiments; 2600 *count = num_experiments;
2601 return experiments; 2601 return experiments;
2602 } 2602 }
2603 2603
2604 } // namespace testing 2604 } // namespace testing
2605 2605
2606 } // namespace about_flags 2606 } // namespace about_flags
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/web_applications/web_app_win.cc » ('j') | chrome/browser/web_applications/web_app_win.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698