Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code

Side by Side Diff: src/plugin/PluginClass.cpp

Issue 6390087684194304: [superseded] Issue 1265 - Improve detection of mime type of the expected response (Closed)
Patch Set: restore assuming XHR request type when xml is queried Created Sept. 11, 2014, 9:44 a.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff | Download patch
« no previous file with comments | « src/plugin/AdblockPlusDomTraverser.cpp ('k') | src/plugin/PluginFilter.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 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 2
3 #include "PluginClass.h" 3 #include "PluginClass.h"
4 #include "PluginSettings.h" 4 #include "PluginSettings.h"
5 #include "PluginSystem.h" 5 #include "PluginSystem.h"
6 #ifdef SUPPORT_FILTER 6 #ifdef SUPPORT_FILTER
7 #include "PluginFilter.h" 7 #include "PluginFilter.h"
8 #endif 8 #endif
9 #include "PluginMimeFilterClient.h" 9 #include "PluginMimeFilterClient.h"
10 #include "PluginClient.h" 10 #include "PluginClient.h"
(...skipping 1533 matching lines...) Expand 10 before | Expand all | Expand 10 after
1544 { 1544 {
1545 } 1545 }
1546 #ifdef SUPPORT_WHITELIST 1546 #ifdef SUPPORT_WHITELIST
1547 else if (client->IsWhitelistedUrl(std::wstring(url))) 1547 else if (client->IsWhitelistedUrl(std::wstring(url)))
1548 { 1548 {
1549 hIcon = GetIcon(ICON_PLUGIN_DISABLED); 1549 hIcon = GetIcon(ICON_PLUGIN_DISABLED);
1550 } 1550 }
1551 #endif // SUPPORT_WHITELIST 1551 #endif // SUPPORT_WHITELIST
1552 else 1552 else
1553 { 1553 {
1554 CPluginSettings* settings = CPluginSettings::GetInstance();
1555 hIcon = GetIcon(ICON_PLUGIN_ENABLED); 1554 hIcon = GetIcon(ICON_PLUGIN_ENABLED);
1556 } 1555 }
1557
1558 #endif // PRODUCT_ADBLOCKPLUS 1556 #endif // PRODUCT_ADBLOCKPLUS
1559 } 1557 }
1560 1558
1561 return hIcon; 1559 return hIcon;
1562 } 1560 }
1563 1561
1564 1562
1565 LRESULT CALLBACK CPluginClass::PaneWindowProc(HWND hWnd, UINT message, WPARAM wP aram, LPARAM lParam) 1563 LRESULT CALLBACK CPluginClass::PaneWindowProc(HWND hWnd, UINT message, WPARAM wP aram, LPARAM lParam)
1566 { 1564 {
1567 // Find tab 1565 // Find tab
(...skipping 321 matching lines...) Expand 10 before | Expand all | Expand 10 after
1889 } 1887 }
1890 } 1888 }
1891 } 1889 }
1892 1890
1893 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT); 1891 hTabWnd = ::GetWindow(hTabWnd, GW_HWNDNEXT);
1894 } 1892 }
1895 1893
1896 return hTabWnd; 1894 return hTabWnd;
1897 1895
1898 } 1896 }
OLDNEW
« no previous file with comments | « src/plugin/AdblockPlusDomTraverser.cpp ('k') | src/plugin/PluginFilter.cpp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld