| 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 "chrome/browser/ui/webui/options/options_ui.h" | 5 #include "chrome/browser/ui/webui/options/options_ui.h" |
| 6 | 6 |
| 7 #include <algorithm> | 7 #include <algorithm> |
| 8 #include <utility> | 8 #include <utility> |
| 9 #include <vector> | 9 #include <vector> |
| 10 | 10 |
| (...skipping 546 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 557 std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue()); | 557 std::unique_ptr<base::DictionaryValue> entry(new base::DictionaryValue()); |
| 558 entry->SetString("title", match.description); | 558 entry->SetString("title", match.description); |
| 559 entry->SetString("displayURL", match.contents); | 559 entry->SetString("displayURL", match.contents); |
| 560 entry->SetString("url", match.destination_url.spec()); | 560 entry->SetString("url", match.destination_url.spec()); |
| 561 suggestions->Append(std::move(entry)); | 561 suggestions->Append(std::move(entry)); |
| 562 } | 562 } |
| 563 } | 563 } |
| 564 | 564 |
| 565 void OptionsUI::ReadyToCommitNavigation( | 565 void OptionsUI::ReadyToCommitNavigation( |
| 566 content::NavigationHandle* navigation_handle) { | 566 content::NavigationHandle* navigation_handle) { |
| 567 if (navigation_handle->IsSamePage()) | 567 if (navigation_handle->IsSameDocument()) |
| 568 return; | 568 return; |
| 569 | 569 |
| 570 load_start_time_ = base::Time::Now(); | 570 load_start_time_ = base::Time::Now(); |
| 571 if (navigation_handle->GetRenderFrameHost()->GetRenderViewHost() == | 571 if (navigation_handle->GetRenderFrameHost()->GetRenderViewHost() == |
| 572 web_ui()->GetWebContents()->GetRenderViewHost() && | 572 web_ui()->GetWebContents()->GetRenderViewHost() && |
| 573 navigation_handle->GetURL().host_piece() == | 573 navigation_handle->GetURL().host_piece() == |
| 574 chrome::kChromeUISettingsFrameHost) { | 574 chrome::kChromeUISettingsFrameHost) { |
| 575 for (size_t i = 0; i < handlers_.size(); ++i) | 575 for (size_t i = 0; i < handlers_.size(); ++i) |
| 576 handlers_[i]->PageLoadStarted(); | 576 handlers_[i]->PageLoadStarted(); |
| 577 } | 577 } |
| (...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 629 // Add only if handler's service is enabled. | 629 // Add only if handler's service is enabled. |
| 630 if (handler->IsEnabled()) { | 630 if (handler->IsEnabled()) { |
| 631 // Add handler to the list and also pass the ownership. | 631 // Add handler to the list and also pass the ownership. |
| 632 web_ui()->AddMessageHandler(std::move(handler)); | 632 web_ui()->AddMessageHandler(std::move(handler)); |
| 633 handler_raw->GetLocalizedValues(localized_strings); | 633 handler_raw->GetLocalizedValues(localized_strings); |
| 634 handlers_.push_back(handler_raw); | 634 handlers_.push_back(handler_raw); |
| 635 } | 635 } |
| 636 } | 636 } |
| 637 | 637 |
| 638 } // namespace options | 638 } // namespace options |
| OLD | NEW |