| Index: chrome/browser/automation/automation_provider.cc
|
| ===================================================================
|
| --- chrome/browser/automation/automation_provider.cc (revision 2626)
|
| +++ chrome/browser/automation/automation_provider.cc (working copy)
|
| @@ -169,7 +169,7 @@
|
|
|
| bool FinishedRestoring() {
|
| return (!controller_->needs_reload() && !controller_->GetPendingEntry() &&
|
| - !controller_->active_contents()->IsLoading());
|
| + !controller_->active_contents()->is_loading());
|
| }
|
|
|
| void SendDone() {
|
| @@ -1637,8 +1637,8 @@
|
| NavigationController* nav_controller =
|
| tab_tracker_->GetResource(handle);
|
| TabContents* tab = nav_controller->active_contents();
|
| - if (tab && index < static_cast<int>(tab->child_windows().size())) {
|
| - ConstrainedWindow* window = tab->child_windows()[index];
|
| + if (tab && index < static_cast<int>(tab->child_windows_.size())) {
|
| + ConstrainedWindow* window = tab->child_windows_[index];
|
| cwindow_handle = cwindow_tracker_->Add(window);
|
| }
|
| }
|
|
|