| OLD | NEW |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | 1 // Copyright 2016 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/settings/about_handler.h" | 5 #include "chrome/browser/ui/webui/settings/about_handler.h" |
| 6 | 6 |
| 7 #include <stddef.h> | 7 #include <stddef.h> |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 | 10 |
| (...skipping 422 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 433 #if defined(OS_MACOSX) | 433 #if defined(OS_MACOSX) |
| 434 void AboutHandler::PromoteUpdater(const base::ListValue* args) { | 434 void AboutHandler::PromoteUpdater(const base::ListValue* args) { |
| 435 version_updater_->PromoteUpdater(); | 435 version_updater_->PromoteUpdater(); |
| 436 } | 436 } |
| 437 #endif | 437 #endif |
| 438 | 438 |
| 439 void AboutHandler::HandleOpenFeedbackDialog(const base::ListValue* args) { | 439 void AboutHandler::HandleOpenFeedbackDialog(const base::ListValue* args) { |
| 440 DCHECK(args->empty()); | 440 DCHECK(args->empty()); |
| 441 Browser* browser = | 441 Browser* browser = |
| 442 chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); | 442 chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); |
| 443 chrome::OpenFeedbackDialog(browser); | 443 chrome::OpenFeedbackDialog(browser, |
| 444 chrome::kFeedbackSourceMdSettingsAboutPage); |
| 444 } | 445 } |
| 445 | 446 |
| 446 void AboutHandler::HandleOpenHelpPage(const base::ListValue* args) { | 447 void AboutHandler::HandleOpenHelpPage(const base::ListValue* args) { |
| 447 DCHECK(args->empty()); | 448 DCHECK(args->empty()); |
| 448 Browser* browser = | 449 Browser* browser = |
| 449 chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); | 450 chrome::FindBrowserWithWebContents(web_ui()->GetWebContents()); |
| 450 chrome::ShowHelp(browser, chrome::HELP_SOURCE_WEBUI); | 451 chrome::ShowHelp(browser, chrome::HELP_SOURCE_WEBUI); |
| 451 } | 452 } |
| 452 | 453 |
| 453 #if defined(OS_CHROMEOS) | 454 #if defined(OS_CHROMEOS) |
| (...skipping 190 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 644 label_dir_path.AppendASCII(kRegulatoryLabelImageFilename).MaybeAsASCII(); | 645 label_dir_path.AppendASCII(kRegulatoryLabelImageFilename).MaybeAsASCII(); |
| 645 std::string url = | 646 std::string url = |
| 646 std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path; | 647 std::string("chrome://") + chrome::kChromeOSAssetHost + "/" + image_path; |
| 647 regulatory_info->SetString("url", url); | 648 regulatory_info->SetString("url", url); |
| 648 | 649 |
| 649 ResolveJavascriptCallback(base::Value(callback_id), *regulatory_info); | 650 ResolveJavascriptCallback(base::Value(callback_id), *regulatory_info); |
| 650 } | 651 } |
| 651 #endif // defined(OS_CHROMEOS) | 652 #endif // defined(OS_CHROMEOS) |
| 652 | 653 |
| 653 } // namespace settings | 654 } // namespace settings |
| OLD | NEW |