Rename the ShellUtilWin service to UtilWin
As I plan to add other utilities to this interface that doesn't relate
to the shell, the previous name is no longer fitting.
Bug: 921746
Change-Id: Ie61f3378315eefdc3751aac895c3c362fc95d4ce
Reviewed-on: https://chromium-review.googlesource.com/c/1416270
Reviewed-by: Daniel Cheng <[email protected]>
Reviewed-by: Greg Thompson <[email protected]>
Reviewed-by: Sébastien Marchand <[email protected]>
Commit-Queue: Patrick Monette <[email protected]>
Auto-Submit: Patrick Monette <[email protected]>
Cr-Commit-Position: refs/heads/master@{#624609}diff --git a/chrome/browser/shell_integration_win.cc b/chrome/browser/shell_integration_win.cc
index 8daaee10..17433d1 100644
--- a/chrome/browser/shell_integration_win.cc
+++ b/chrome/browser/shell_integration_win.cc
@@ -51,7 +51,7 @@
#include "chrome/installer/util/scoped_user_protocol_entry.h"
#include "chrome/installer/util/shell_util.h"
#include "chrome/services/util_win/public/mojom/constants.mojom.h"
-#include "chrome/services/util_win/public/mojom/shell_util_win.mojom.h"
+#include "chrome/services/util_win/public/mojom/util_win.mojom.h"
#include "components/variations/variations_associated_data.h"
#include "content/public/common/service_manager_connection.h"
#include "services/service_manager/public/cpp/connector.h"
@@ -469,7 +469,7 @@
void OnConnectionError();
void OnIsPinnedToTaskbarResult(bool succeeded, bool is_pinned_to_taskbar);
- chrome::mojom::ShellUtilWinPtr shell_util_win_ptr_;
+ chrome::mojom::UtilWinPtr util_win_ptr_;
// The connector used to retrieve the Patch service. We can't simply use
// content::ServiceManagerConnection::GetForProcess()->GetConnector() as this
// is called on a background thread.
@@ -503,13 +503,12 @@
DCHECK(error_callback_);
DCHECK(result_callback_);
- connector_->BindInterface(chrome::mojom::kUtilWinServiceName,
- &shell_util_win_ptr_);
- // |shell_util_win_ptr_| owns the callbacks and is guaranteed to be destroyed
- // before |this|, therefore making base::Unretained() safe to use.
- shell_util_win_ptr_.set_connection_error_handler(base::Bind(
+ connector_->BindInterface(chrome::mojom::kUtilWinServiceName, &util_win_ptr_);
+ // |util_win_ptr_| owns the callbacks and is guaranteed to be destroyed before
+ // |this|, therefore making base::Unretained() safe to use.
+ util_win_ptr_.set_connection_error_handler(base::Bind(
&IsPinnedToTaskbarHelper::OnConnectionError, base::Unretained(this)));
- shell_util_win_ptr_->IsPinnedToTaskbar(
+ util_win_ptr_->IsPinnedToTaskbar(
base::Bind(&IsPinnedToTaskbarHelper::OnIsPinnedToTaskbarResult,
base::Unretained(this)));
}
