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

Side by Side Diff: chrome_frame/chrome_frame_automation.cc

Issue 338010: Hopefully the last of the fixes to get Chrome Frame tests going again. Added ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 11 years, 1 month 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/chrome_frame_automation.h ('k') | no next file » | 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) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/chrome_frame_automation.h" 5 #include "chrome_frame/chrome_frame_automation.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/file_util.h" 9 #include "base/file_util.h"
10 #include "base/file_version_info.h" 10 #include "base/file_version_info.h"
(...skipping 1031 matching lines...) Expand 10 before | Expand all | Expand 10 after
1042 if (request) { 1042 if (request) {
1043 int request_id = request->id(); 1043 int request_id = request->id();
1044 request->Stop(); 1044 request->Stop();
1045 } 1045 }
1046 } 1046 }
1047 1047
1048 DCHECK(request_map_.empty()); 1048 DCHECK(request_map_.empty());
1049 request_map_.clear(); 1049 request_map_.clear();
1050 } 1050 }
1051 1051
1052 void ChromeFrameAutomationClient::CleanupAsyncRequests() {
1053 RequestMap::iterator index = request_map_.begin();
1054 while (index != request_map_.end()) {
1055 PluginUrlRequest* request = (*index).second;
1056 if (request) {
1057 int request_id = request->id();
1058 request->Stop();
1059 }
1060 index++;
1061 }
1062
1063 DCHECK(request_map_.empty());
1064 request_map_.clear();
1065 }
1066
1052 bool ChromeFrameAutomationClient::Reinitialize( 1067 bool ChromeFrameAutomationClient::Reinitialize(
1053 ChromeFrameDelegate* delegate) { 1068 ChromeFrameDelegate* delegate) {
1054 if (!tab_.get() || !::IsWindow(chrome_window_)) { 1069 if (!tab_.get() || !::IsWindow(chrome_window_)) {
1055 NOTREACHED(); 1070 NOTREACHED();
1056 DLOG(WARNING) << "ChromeFrameAutomationClient instance reused " 1071 DLOG(WARNING) << "ChromeFrameAutomationClient instance reused "
1057 << "with invalid tab"; 1072 << "with invalid tab";
1058 return false; 1073 return false;
1059 } 1074 }
1060 1075
1061 if (!delegate) { 1076 if (!delegate) {
(...skipping 19 matching lines...) Expand all
1081 if (font_size < SMALLEST_FONT || 1096 if (font_size < SMALLEST_FONT ||
1082 font_size > LARGEST_FONT) { 1097 font_size > LARGEST_FONT) {
1083 NOTREACHED() << "Invalid font size specified : " 1098 NOTREACHED() << "Invalid font size specified : "
1084 << font_size; 1099 << font_size;
1085 return; 1100 return;
1086 } 1101 }
1087 1102
1088 Send(new AutomationMsg_SetPageFontSize(0, tab_handle_, font_size)); 1103 Send(new AutomationMsg_SetPageFontSize(0, tab_handle_, font_size));
1089 } 1104 }
1090 1105
OLDNEW
« no previous file with comments | « chrome_frame/chrome_frame_automation.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698