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

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

Issue 248863003: Add a chrome://flags item "allow-insecure-websocket-from-https-origin" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed #9 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
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 1768 matching lines...) Expand 10 before | Expand all | Expand 10 after
1779 }, 1779 },
1780 #if defined(OS_CHROMEOS) 1780 #if defined(OS_CHROMEOS)
1781 { 1781 {
1782 "enable-filemanager-mtp", 1782 "enable-filemanager-mtp",
1783 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME, 1783 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_NAME,
1784 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION, 1784 IDS_FLAGS_ENABLE_FILE_MANAGER_MTP_DESCRIPTION,
1785 kOsCrOS, 1785 kOsCrOS,
1786 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFileManagerMTP) 1786 SINGLE_VALUE_TYPE(chromeos::switches::kEnableFileManagerMTP)
1787 }, 1787 },
1788 #endif 1788 #endif
1789 // TODO(tyoshino): Remove this temporary flag and command line switch. See
1790 // crbug.com/366483 for the target milestone.
1791 {
1792 "allow-insecure-websocket-from-https-origin",
1793 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_NAME,
1794 IDS_FLAGS_ALLOW_INSECURE_WEBSOCKET_FROM_HTTPS_ORIGIN_DESCRIPTION,
1795 kOsAll,
1796 SINGLE_VALUE_TYPE(switches::kAllowInsecureWebSocketFromHttpsOrigin)
1797 },
1789 }; 1798 };
1790 1799
1791 const Experiment* experiments = kExperiments; 1800 const Experiment* experiments = kExperiments;
1792 size_t num_experiments = arraysize(kExperiments); 1801 size_t num_experiments = arraysize(kExperiments);
1793 1802
1794 // Stores and encapsulates the little state that about:flags has. 1803 // Stores and encapsulates the little state that about:flags has.
1795 class FlagsState { 1804 class FlagsState {
1796 public: 1805 public:
1797 FlagsState() : needs_restart_(false) {} 1806 FlagsState() : needs_restart_(false) {}
1798 void ConvertFlagsToSwitches(FlagsStorage* flags_storage, 1807 void ConvertFlagsToSwitches(FlagsStorage* flags_storage,
(...skipping 504 matching lines...) Expand 10 before | Expand all | Expand 10 after
2303 } 2312 }
2304 2313
2305 const Experiment* GetExperiments(size_t* count) { 2314 const Experiment* GetExperiments(size_t* count) {
2306 *count = num_experiments; 2315 *count = num_experiments;
2307 return experiments; 2316 return experiments;
2308 } 2317 }
2309 2318
2310 } // namespace testing 2319 } // namespace testing
2311 2320
2312 } // namespace about_flags 2321 } // namespace about_flags
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | content/browser/renderer_host/render_process_host_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698