Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "content/renderer/render_view_impl.h" | 5 #include "content/renderer/render_view_impl.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <cmath> | 8 #include <cmath> |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 652 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 663 const std::string region_code = | 663 const std::string region_code = |
| 664 command_line.HasSwitch(switches::kNetworkCountryIso) | 664 command_line.HasSwitch(switches::kNetworkCountryIso) |
| 665 ? command_line.GetSwitchValueASCII(switches::kNetworkCountryIso) | 665 ? command_line.GetSwitchValueASCII(switches::kNetworkCountryIso) |
| 666 : device_info->GetNetworkCountryIso(); | 666 : device_info->GetNetworkCountryIso(); |
| 667 content_detectors_.push_back(linked_ptr<ContentDetector>( | 667 content_detectors_.push_back(linked_ptr<ContentDetector>( |
| 668 new AddressDetector())); | 668 new AddressDetector())); |
| 669 content_detectors_.push_back(linked_ptr<ContentDetector>( | 669 content_detectors_.push_back(linked_ptr<ContentDetector>( |
| 670 new PhoneNumberDetector(region_code))); | 670 new PhoneNumberDetector(region_code))); |
| 671 content_detectors_.push_back(linked_ptr<ContentDetector>( | 671 content_detectors_.push_back(linked_ptr<ContentDetector>( |
| 672 new EmailDetector())); | 672 new EmailDetector())); |
| 673 | |
| 674 // Enable load progress reporting so that the omnibox can show progress. | |
| 675 SetReportLoadProgressEnabled(true); | |
|
jamesr
2012/10/18 22:13:12
I can't find any other callers to this function in
| |
| 673 #endif | 676 #endif |
| 674 | 677 |
| 675 if (counter) { | 678 if (counter) { |
| 676 shared_popup_counter_ = counter; | 679 shared_popup_counter_ = counter; |
| 677 // Only count this if it isn't swapped out upon creation. | 680 // Only count this if it isn't swapped out upon creation. |
| 678 if (!swapped_out) | 681 if (!swapped_out) |
| 679 shared_popup_counter_->data++; | 682 shared_popup_counter_->data++; |
| 680 decrement_shared_popup_at_destruction_ = true; | 683 decrement_shared_popup_at_destruction_ = true; |
| 681 } else { | 684 } else { |
| 682 shared_popup_counter_ = new SharedRenderViewCounter(0); | 685 shared_popup_counter_ = new SharedRenderViewCounter(0); |
| (...skipping 5671 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 6354 | 6357 |
| 6355 updating_frame_tree_ = true; | 6358 updating_frame_tree_ = true; |
| 6356 active_frame_id_map_.clear(); | 6359 active_frame_id_map_.clear(); |
| 6357 | 6360 |
| 6358 target_process_id_ = process_id; | 6361 target_process_id_ = process_id; |
| 6359 target_routing_id_ = route_id; | 6362 target_routing_id_ = route_id; |
| 6360 CreateFrameTree(webview()->mainFrame(), frames); | 6363 CreateFrameTree(webview()->mainFrame(), frames); |
| 6361 | 6364 |
| 6362 updating_frame_tree_ = false; | 6365 updating_frame_tree_ = false; |
| 6363 } | 6366 } |
| OLD | NEW |