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

Side by Side Diff: chrome_frame/test/chrome_frame_test_utils.cc

Issue 2081007: Enable warning 4389 as an error on windows builds. This will make... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 10 years, 7 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
« no previous file with comments | « chrome_frame/html_utils.cc ('k') | chrome_frame/test/exception_barrier_unittest.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 "chrome_frame/test/chrome_frame_test_utils.h" 5 #include "chrome_frame/test/chrome_frame_test_utils.h"
6 6
7 #include <atlbase.h> 7 #include <atlbase.h>
8 #include <atlwin.h> 8 #include <atlwin.h>
9 #include <iepmapi.h> 9 #include <iepmapi.h>
10 #include <sddl.h> 10 #include <sddl.h>
(...skipping 757 matching lines...) Expand 10 before | Expand all | Expand 10 after
768 HRESULT WebBrowserEventSink::SetWebBrowser(IWebBrowser2* web_browser2) { 768 HRESULT WebBrowserEventSink::SetWebBrowser(IWebBrowser2* web_browser2) {
769 DCHECK(web_browser2_.get() == NULL); 769 DCHECK(web_browser2_.get() == NULL);
770 DCHECK(!is_main_browser_object_); 770 DCHECK(!is_main_browser_object_);
771 web_browser2_ = web_browser2; 771 web_browser2_ = web_browser2;
772 web_browser2_->put_Visible(VARIANT_TRUE); 772 web_browser2_->put_Visible(VARIANT_TRUE);
773 HRESULT hr = DispEventAdvise(web_browser2_, &DIID_DWebBrowserEvents2); 773 HRESULT hr = DispEventAdvise(web_browser2_, &DIID_DWebBrowserEvents2);
774 return hr; 774 return hr;
775 } 775 }
776 776
777 HRESULT WebBrowserEventSink::CloseWebBrowser() { 777 HRESULT WebBrowserEventSink::CloseWebBrowser() {
778 DCHECK_EQ(process_id_to_wait_for_, 0); 778 DCHECK_EQ(process_id_to_wait_for_, 0u);
779 if (!web_browser2_) 779 if (!web_browser2_)
780 return E_FAIL; 780 return E_FAIL;
781 781
782 DisconnectFromChromeFrame(); 782 DisconnectFromChromeFrame();
783 web_browser2_->Quit(); 783 web_browser2_->Quit();
784 return S_OK; 784 return S_OK;
785 } 785 }
786 786
787 void WebBrowserEventSink::ExpectRendererWindowHasFocus() { 787 void WebBrowserEventSink::ExpectRendererWindowHasFocus() {
788 HWND renderer_window = GetRendererWindow(); 788 HWND renderer_window = GetRendererWindow();
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 if (GetInstalledIEVersion() == IE_8) { 886 if (GetInstalledIEVersion() == IE_8) {
887 profile_path = GetProfilePath(kIEProfileName); 887 profile_path = GetProfilePath(kIEProfileName);
888 } else { 888 } else {
889 profile_path = GetIETemporaryFilesFolder(); 889 profile_path = GetIETemporaryFilesFolder();
890 profile_path = profile_path.Append(L"Google Chrome Frame"); 890 profile_path = profile_path.Append(L"Google Chrome Frame");
891 } 891 }
892 return profile_path; 892 return profile_path;
893 } 893 }
894 894
895 } // namespace chrome_frame_test 895 } // namespace chrome_frame_test
OLDNEW
« no previous file with comments | « chrome_frame/html_utils.cc ('k') | chrome_frame/test/exception_barrier_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698