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

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
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)
(...skipping 17 matching lines...) Expand all
28 const CommandLine& command_line = *CommandLine::ForCurrentProcess(); 28 const CommandLine& command_line = *CommandLine::ForCurrentProcess();
29 29
30 // --disable-pinch should always disable pinch 30 // --disable-pinch should always disable pinch
31 if (command_line.HasSwitch(switches::kDisablePinch)) 31 if (command_line.HasSwitch(switches::kDisablePinch))
32 return false; 32 return false;
33 33
34 #if defined(OS_WIN) 34 #if defined(OS_WIN)
35 return base::win::GetVersion() >= base::win::VERSION_WIN8; 35 return base::win::GetVersion() >= base::win::VERSION_WIN8;
36 #elif defined(OS_CHROMEOS) 36 #elif defined(OS_CHROMEOS)
37 return true; 37 return true;
38 #endif 38 #else
39
40 return command_line.HasSwitch(switches::kEnableViewport) || 39 return command_line.HasSwitch(switches::kEnableViewport) ||
41 command_line.HasSwitch(switches::kEnablePinch); 40 command_line.HasSwitch(switches::kEnablePinch);
41 #endif
42 } 42 }
43 43
44 } // namespace content 44 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698