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

Delta Between Two Patch Sets: src/plugin/PluginTabBase.cpp

Issue 11043057: First run page triggering (Closed)
Left Patch Set: Comments addressed Created July 20, 2013, 8:11 p.m.
Right Patch Set: Minor refactoring. Renaming and a small cleanup. Created July 26, 2013, 12:05 p.m.
Left:
Right:
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
Right: Side by side diff | Download
« no previous file with change/comment | « src/plugin/PluginSettings.cpp ('k') | src/plugin/PluginUserSettings.cpp » ('j') | no next file with change/comment »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
LEFTRIGHT
(no file at all)
1 #include "PluginStdAfx.h" 1 #include "PluginStdAfx.h"
2 2
3 #include "PluginClient.h" 3 #include "PluginClient.h"
4 #include "PluginSettings.h" 4 #include "PluginSettings.h"
5 #ifdef SUPPORT_CONFIG 5 #ifdef SUPPORT_CONFIG
6 #include "PluginConfig.h" 6 #include "PluginConfig.h"
7 #endif 7 #endif
8 #include "PluginTab.h" 8 #include "PluginTab.h"
9 #include "PluginDomTraverser.h" 9 #include "PluginDomTraverser.h"
10 #include "PluginClass.h" 10 #include "PluginClass.h"
(...skipping 115 matching lines...) Expand 10 before | Expand all | Expand 10 after
126 126
127 if (isDocumentBrowser) 127 if (isDocumentBrowser)
128 { 128 {
129 if (url != documentUrl) 129 if (url != documentUrl)
130 { 130 {
131 SetDocumentUrl(url); 131 SetDocumentUrl(url);
132 } 132 }
133 133
134 CString log; 134 CString log;
135 log.Format(L"Current URL: %s, settings URL: %s", url, UserSettingsFileUrl(). c_str()); 135 log.Format(L"Current URL: %s, settings URL: %s", url, UserSettingsFileUrl(). c_str());
136 DEBUG_ERROR_LOG(0, 0, 0, log); 136 DEBUG_GENERAL(log);
137 if (0 == url.CompareNoCase(CString(UserSettingsFileUrl().c_str()))) 137 if (0 == url.CompareNoCase(CString(UserSettingsFileUrl().c_str())) ||
138 0 == url.CompareNoCase(CString(FirstRunPageFileUrl().c_str())) )
138 { 139 {
139 CComPtr<IDispatch> pDocDispatch; 140 CComPtr<IDispatch> pDocDispatch;
140 browser->get_Document(&pDocDispatch); 141 browser->get_Document(&pDocDispatch);
141 CComQIPtr<IHTMLDocument2> pDoc2 = pDocDispatch; 142 CComQIPtr<IHTMLDocument2> pDoc2 = pDocDispatch;
142 if (pDoc2) 143 if (pDoc2)
143 { 144 {
144 CComPtr<IHTMLWindow2> pWnd2; 145 CComPtr<IHTMLWindow2> pWnd2;
145 pDoc2->get_parentWindow(&pWnd2); 146 pDoc2->get_parentWindow(&pWnd2);
146 if (pWnd2) 147 if (pWnd2)
147 { 148 {
(...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after
358 359
359 // Non-hanging sleep 360 // Non-hanging sleep
360 Sleep(50); 361 Sleep(50);
361 } 362 }
362 363
363 tabLoopIteration++; 364 tabLoopIteration++;
364 } 365 }
365 366
366 return 0; 367 return 0;
367 } 368 }
LEFTRIGHT

Powered by Google App Engine
This is Rietveld