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

Side by Side Diff: content/common/content_switches_internal.cc

Issue 202863004: Fix "unreachable code" warnings (MSVC warning 4702) in content/. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 6 years, 9 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 | « content/common/content_paths.cc ('k') | content/common/indexed_db/indexed_db_key.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) 2014 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2014 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 "content/common/content_switches_internal.h" 5 #include "content/common/content_switches_internal.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "content/public/common/content_switches.h" 8 #include "content/public/common/content_switches.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
11 #include "base/win/windows_version.h" 11 #include "base/win/windows_version.h"
12 #endif 12 #endif
13 13
14 namespace content { 14 namespace content {
15 15
16 bool IsPinchToZoomEnabled() { 16 bool IsPinchToZoomEnabled() {
17 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 17 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
18 18
19 // --disable-pinch should always disable pinch 19 // --disable-pinch should always disable pinch
20 if (command_line.HasSwitch(switches::kDisablePinch)) 20 if (command_line.HasSwitch(switches::kDisablePinch))
21 return false; 21 return false;
22 22
23 #if defined(OS_WIN) 23 #if defined(OS_WIN)
24 return base::win::GetVersion() >= base::win::VERSION_WIN8; 24 return base::win::GetVersion() >= base::win::VERSION_WIN8;
25 #elif defined(OS_CHROMEOS) 25 #elif defined(OS_CHROMEOS)
26 return true; 26 return true;
27 #endif 27 #else
28
29 return command_line.HasSwitch(switches::kEnableViewport) || 28 return command_line.HasSwitch(switches::kEnableViewport) ||
30 command_line.HasSwitch(switches::kEnablePinch); 29 command_line.HasSwitch(switches::kEnablePinch);
30 #endif
31 } 31 }
32 32
33 } // namespace content 33 } // namespace content
OLDNEW
« no previous file with comments | « content/common/content_paths.cc ('k') | content/common/indexed_db/indexed_db_key.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698