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

Side by Side Diff: Source/core/page/Settings.cpp

Issue 14107015: Rename OS(DARWIN) to OS(MACOSX). (Closed) Base URL: https://chromium.googlesource.com/chromium/blink.git@master
Patch Set: Rebase Created 7 years, 3 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
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/scrolling/ScrollingCoordinator.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 /* 1 /*
2 * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserv ed. 2 * Copyright (C) 2006, 2007, 2008, 2009, 2011, 2012 Apple Inc. All rights reserv ed.
3 * 3 *
4 * Redistribution and use in source and binary forms, with or without 4 * Redistribution and use in source and binary forms, with or without
5 * modification, are permitted provided that the following conditions 5 * modification, are permitted provided that the following conditions
6 * are met: 6 * are met:
7 * 1. Redistributions of source code must retain the above copyright 7 * 1. Redistributions of source code must retain the above copyright
8 * notice, this list of conditions and the following disclaimer. 8 * notice, this list of conditions and the following disclaimer.
9 * 2. Redistributions in binary form must reproduce the above copyright 9 * 2. Redistributions in binary form must reproduce the above copyright
10 * notice, this list of conditions and the following disclaimer in the 10 * notice, this list of conditions and the following disclaimer in the
(...skipping 70 matching lines...) Expand 10 before | Expand all | Expand 10 after
81 81
82 // NOTEs 82 // NOTEs
83 // 1) EditingMacBehavior comprises builds on Mac; 83 // 1) EditingMacBehavior comprises builds on Mac;
84 // 2) EditingWindowsBehavior comprises builds on Windows; 84 // 2) EditingWindowsBehavior comprises builds on Windows;
85 // 3) EditingUnixBehavior comprises all unix-based systems, but Darwin/MacOS/An droid (and then abusing the terminology); 85 // 3) EditingUnixBehavior comprises all unix-based systems, but Darwin/MacOS/An droid (and then abusing the terminology);
86 // 4) EditingAndroidBehavior comprises Android builds. 86 // 4) EditingAndroidBehavior comprises Android builds.
87 // 99) MacEditingBehavior is used a fallback. 87 // 99) MacEditingBehavior is used a fallback.
88 static EditingBehaviorType editingBehaviorTypeForPlatform() 88 static EditingBehaviorType editingBehaviorTypeForPlatform()
89 { 89 {
90 return 90 return
91 #if OS(DARWIN) 91 #if OS(MACOSX)
92 EditingMacBehavior 92 EditingMacBehavior
93 #elif OS(WINDOWS) 93 #elif OS(WINDOWS)
94 EditingWindowsBehavior 94 EditingWindowsBehavior
95 #elif OS(ANDROID) 95 #elif OS(ANDROID)
96 EditingAndroidBehavior 96 EditingAndroidBehavior
97 #elif OS(UNIX) 97 #elif OS(UNIX)
98 EditingUnixBehavior 98 EditingUnixBehavior
99 #else 99 #else
100 // Fallback 100 // Fallback
101 EditingMacBehavior 101 EditingMacBehavior
102 #endif 102 #endif
103 ; 103 ;
104 } 104 }
105 105
106 static const bool defaultUnifiedTextCheckerEnabled = false; 106 static const bool defaultUnifiedTextCheckerEnabled = false;
107 #if OS(DARWIN) 107 #if OS(MACOSX)
108 static const bool defaultSmartInsertDeleteEnabled = true; 108 static const bool defaultSmartInsertDeleteEnabled = true;
109 #else 109 #else
110 static const bool defaultSmartInsertDeleteEnabled = false; 110 static const bool defaultSmartInsertDeleteEnabled = false;
111 #endif 111 #endif
112 #if OS(WINDOWS) 112 #if OS(WINDOWS)
113 static const bool defaultSelectTrailingWhitespaceEnabled = true; 113 static const bool defaultSelectTrailingWhitespaceEnabled = true;
114 #else 114 #else
115 static const bool defaultSelectTrailingWhitespaceEnabled = false; 115 static const bool defaultSelectTrailingWhitespaceEnabled = false;
116 #endif 116 #endif
117 117
(...skipping 268 matching lines...) Expand 10 before | Expand all | Expand 10 after
386 { 386 {
387 if (m_viewportEnabled == enabled) 387 if (m_viewportEnabled == enabled)
388 return; 388 return;
389 389
390 m_viewportEnabled = enabled; 390 m_viewportEnabled = enabled;
391 if (m_page->mainFrame()) 391 if (m_page->mainFrame())
392 m_page->mainFrame()->document()->updateViewportArguments(); 392 m_page->mainFrame()->document()->updateViewportArguments();
393 } 393 }
394 394
395 } // namespace WebCore 395 } // namespace WebCore
OLDNEW
« no previous file with comments | « Source/core/page/EventHandler.cpp ('k') | Source/core/page/scrolling/ScrollingCoordinator.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698