| 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 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.
h" | 5 #import "chrome/browser/ui/cocoa/extensions/extension_install_dialog_controller.
h" |
| 6 | 6 |
| 7 #include <utility> | 7 #include <utility> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/callback_helpers.h" | 10 #include "base/callback_helpers.h" |
| 11 #include "base/logging.h" | 11 #include "base/logging.h" |
| 12 #include "base/memory/ref_counted.h" | 12 #include "base/memory/ref_counted.h" |
| 13 #include "base/threading/thread_task_runner_handle.h" | 13 #include "base/threading/thread_task_runner_handle.h" |
| 14 #include "chrome/browser/extensions/api/experience_sampling_private/experience_s
ampling.h" | 14 #include "chrome/browser/extensions/api/experience_sampling_private/experience_s
ampling.h" |
| 15 #include "chrome/browser/extensions/extension_install_prompt_show_params.h" | 15 #include "chrome/browser/extensions/extension_install_prompt_show_params.h" |
| 16 #include "chrome/browser/ui/browser.h" | 16 #include "chrome/browser/ui/browser.h" |
| 17 #include "chrome/browser/ui/browser_dialogs.h" | |
| 18 #include "chrome/browser/ui/browser_finder.h" | 17 #include "chrome/browser/ui/browser_finder.h" |
| 19 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh
eet.h" | 18 #import "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_sh
eet.h" |
| 20 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_w
indow.h" | 19 #include "chrome/browser/ui/cocoa/constrained_window/constrained_window_custom_w
indow.h" |
| 21 #import "chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
" | 20 #import "chrome/browser/ui/cocoa/extensions/windowed_install_dialog_controller.h
" |
| 22 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 21 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
| 23 #include "content/public/browser/web_contents.h" | 22 #include "content/public/browser/web_contents.h" |
| 23 #include "ui/base/material_design/material_design_controller.h" |
| 24 | 24 |
| 25 using extensions::ExperienceSamplingEvent; | 25 using extensions::ExperienceSamplingEvent; |
| 26 | 26 |
| 27 namespace { | 27 namespace { |
| 28 | 28 |
| 29 void ShowExtensionInstallDialogImpl( | 29 void ShowExtensionInstallDialogImpl( |
| 30 ExtensionInstallPromptShowParams* show_params, | 30 ExtensionInstallPromptShowParams* show_params, |
| 31 const ExtensionInstallPrompt::DoneCallback& done_callback, | 31 const ExtensionInstallPrompt::DoneCallback& done_callback, |
| 32 std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt) { | 32 std::unique_ptr<ExtensionInstallPrompt::Prompt> prompt) { |
| 33 // These objects will delete themselves when the dialog closes. | 33 // These objects will delete themselves when the dialog closes. |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 106 const char* decision_event) { | 106 const char* decision_event) { |
| 107 if (sampling_event_.get()) | 107 if (sampling_event_.get()) |
| 108 sampling_event_->CreateUserDecisionEvent(decision_event); | 108 sampling_event_->CreateUserDecisionEvent(decision_event); |
| 109 base::ResetAndReturn(&done_callback_).Run(result); | 109 base::ResetAndReturn(&done_callback_).Run(result); |
| 110 constrained_window_->CloseWebContentsModalDialog(); | 110 constrained_window_->CloseWebContentsModalDialog(); |
| 111 } | 111 } |
| 112 | 112 |
| 113 // static | 113 // static |
| 114 ExtensionInstallPrompt::ShowDialogCallback | 114 ExtensionInstallPrompt::ShowDialogCallback |
| 115 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { | 115 ExtensionInstallPrompt::GetDefaultShowDialogCallback() { |
| 116 if (chrome::ToolkitViewsWebUIDialogsEnabled()) | 116 if (ui::MaterialDesignController::IsSecondaryUiMaterial()) |
| 117 return ExtensionInstallPrompt::GetViewsShowDialogCallback(); | 117 return ExtensionInstallPrompt::GetViewsShowDialogCallback(); |
| 118 return base::Bind(&ShowExtensionInstallDialogImpl); | 118 return base::Bind(&ShowExtensionInstallDialogImpl); |
| 119 } | 119 } |
| OLD | NEW |