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

Side by Side Diff: Source/web/ChromeClientImpl.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/rendering/RenderText.cpp ('k') | Source/web/ContextMenuClientImpl.cpp » ('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) 2009 Google Inc. All rights reserved. 2 * Copyright (C) 2009 Google Inc. All rights reserved.
3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies). 3 * Copyright (C) 2010 Nokia Corporation and/or its subsidiary(-ies).
4 * 4 *
5 * Redistribution and use in source and binary forms, with or without 5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions are 6 * modification, are permitted provided that the following conditions are
7 * met: 7 * met:
8 * 8 *
9 * * Redistributions of source code must retain the above copyright 9 * * Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer. 10 * notice, this list of conditions and the following disclaimer.
(...skipping 719 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 m_webView->popupClosed(popupContainer); 730 m_webView->popupClosed(popupContainer);
731 } 731 }
732 732
733 void ChromeClientImpl::setCursor(const WebCore::Cursor& cursor) 733 void ChromeClientImpl::setCursor(const WebCore::Cursor& cursor)
734 { 734 {
735 setCursor(WebCursorInfo(cursor)); 735 setCursor(WebCursorInfo(cursor));
736 } 736 }
737 737
738 void ChromeClientImpl::setCursor(const WebCursorInfo& cursor) 738 void ChromeClientImpl::setCursor(const WebCursorInfo& cursor)
739 { 739 {
740 #if OS(DARWIN) 740 #if OS(MACOSX)
741 // On Mac the mousemove event propagates to both the popup and main window. 741 // On Mac the mousemove event propagates to both the popup and main window.
742 // If a popup is open we don't want the main window to change the cursor. 742 // If a popup is open we don't want the main window to change the cursor.
743 if (m_webView->hasOpenedPopup()) 743 if (m_webView->hasOpenedPopup())
744 return; 744 return;
745 #endif 745 #endif
746 if (m_webView->client()) 746 if (m_webView->client())
747 m_webView->client()->didChangeCursor(cursor); 747 m_webView->client()->didChangeCursor(cursor);
748 } 748 }
749 749
750 void ChromeClientImpl::setCursorForPlugin(const WebCursorInfo& cursor) 750 void ChromeClientImpl::setCursorForPlugin(const WebCursorInfo& cursor)
(...skipping 265 matching lines...) Expand 10 before | Expand all | Expand 10 after
1016 { 1016 {
1017 } 1017 }
1018 1018
1019 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title) 1019 void NavigatorContentUtilsClientImpl::registerProtocolHandler(const String& sche me, const String& baseURL, const String& url, const String& title)
1020 { 1020 {
1021 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title); 1021 m_webView->client()->registerProtocolHandler(scheme, baseURL, url, title);
1022 } 1022 }
1023 #endif 1023 #endif
1024 1024
1025 } // namespace WebKit 1025 } // namespace WebKit
OLDNEW
« no previous file with comments | « Source/core/rendering/RenderText.cpp ('k') | Source/web/ContextMenuClientImpl.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698