OLD | NEW |
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/browser/automation/automation_provider.h" | 5 #include "chrome/browser/automation/automation_provider.h" |
6 | 6 |
7 #include "app/keyboard_codes.h" | 7 #include "app/keyboard_codes.h" |
8 #include "base/json/json_reader.h" | 8 #include "base/json/json_reader.h" |
9 #include "base/trace_event.h" | 9 #include "base/trace_event.h" |
10 #include "base/utf_string_conversions.h" | 10 #include "base/utf_string_conversions.h" |
(...skipping 240 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
251 new ExternalTabContainer(this, automation_resource_message_filter_); | 251 new ExternalTabContainer(this, automation_resource_message_filter_); |
252 | 252 |
253 Profile* profile = settings.is_off_the_record ? | 253 Profile* profile = settings.is_off_the_record ? |
254 profile_->GetOffTheRecordProfile() : profile_; | 254 profile_->GetOffTheRecordProfile() : profile_; |
255 | 255 |
256 // When the ExternalTabContainer window is created we grab a reference on it | 256 // When the ExternalTabContainer window is created we grab a reference on it |
257 // which is released when the window is destroyed. | 257 // which is released when the window is destroyed. |
258 external_tab_container->Init(profile, settings.parent, settings.dimensions, | 258 external_tab_container->Init(profile, settings.parent, settings.dimensions, |
259 settings.style, settings.load_requests_via_automation, | 259 settings.style, settings.load_requests_via_automation, |
260 settings.handle_top_level_requests, NULL, settings.initial_url, | 260 settings.handle_top_level_requests, NULL, settings.initial_url, |
261 settings.referrer, settings.infobars_enabled); | 261 settings.referrer, settings.infobars_enabled, |
| 262 settings.route_all_top_level_navigations); |
262 | 263 |
263 if (AddExternalTab(external_tab_container)) { | 264 if (AddExternalTab(external_tab_container)) { |
264 TabContents* tab_contents = external_tab_container->tab_contents(); | 265 TabContents* tab_contents = external_tab_container->tab_contents(); |
265 *tab_handle = external_tab_container->tab_handle(); | 266 *tab_handle = external_tab_container->tab_handle(); |
266 *tab_container_window = external_tab_container->GetNativeView(); | 267 *tab_container_window = external_tab_container->GetNativeView(); |
267 *tab_window = tab_contents->GetNativeView(); | 268 *tab_window = tab_contents->GetNativeView(); |
268 } else { | 269 } else { |
269 external_tab_container->Uninitialize(); | 270 external_tab_container->Uninitialize(); |
270 } | 271 } |
271 | 272 |
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
536 | 537 |
537 void AutomationProvider::OnSetZoomLevel(int handle, int zoom_level) { | 538 void AutomationProvider::OnSetZoomLevel(int handle, int zoom_level) { |
538 if (tab_tracker_->ContainsHandle(handle)) { | 539 if (tab_tracker_->ContainsHandle(handle)) { |
539 NavigationController* tab = tab_tracker_->GetResource(handle); | 540 NavigationController* tab = tab_tracker_->GetResource(handle); |
540 if (tab->tab_contents() && tab->tab_contents()->render_view_host()) { | 541 if (tab->tab_contents() && tab->tab_contents()->render_view_host()) { |
541 tab->tab_contents()->render_view_host()->Zoom( | 542 tab->tab_contents()->render_view_host()->Zoom( |
542 static_cast<PageZoom::Function>(zoom_level)); | 543 static_cast<PageZoom::Function>(zoom_level)); |
543 } | 544 } |
544 } | 545 } |
545 } | 546 } |
OLD | NEW |