Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(525)

Unified Diff: ash/common/system/chromeos/palette/tools/capture_region_mode.cc

Issue 2738133003: Promotes a handful of members from WmShell to Shell (Closed)
Patch Set: merge Created 3 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: ash/common/system/chromeos/palette/tools/capture_region_mode.cc
diff --git a/ash/common/system/chromeos/palette/tools/capture_region_mode.cc b/ash/common/system/chromeos/palette/tools/capture_region_mode.cc
index bdcbb64665ed1556403e0079f249115099c221c2..dd0c01675c160d44e9b73e4e51f7b3c8f6223a44 100644
--- a/ash/common/system/chromeos/palette/tools/capture_region_mode.cc
+++ b/ash/common/system/chromeos/palette/tools/capture_region_mode.cc
@@ -9,8 +9,8 @@
#include "ash/common/system/chromeos/palette/palette_ids.h"
#include "ash/common/system/toast/toast_data.h"
#include "ash/common/system/toast/toast_manager.h"
-#include "ash/common/wm_shell.h"
#include "ash/resources/vector_icons/vector_icons.h"
+#include "ash/shell.h"
#include "ash/strings/grit/ash_strings.h"
#include "ui/base/l10n/l10n_util.h"
@@ -46,9 +46,9 @@ void CaptureRegionMode::OnEnable() {
ToastData toast(kToastId, l10n_util::GetStringUTF16(
IDS_ASH_STYLUS_TOOLS_CAPTURE_REGION_TOAST),
kToastDurationMs, base::Optional<base::string16>());
- ash::WmShell::Get()->toast_manager()->Show(toast);
+ Shell::GetInstance()->toast_manager()->Show(toast);
- WmShell::Get()->palette_delegate()->TakePartialScreenshot(base::Bind(
+ Shell::GetInstance()->palette_delegate()->TakePartialScreenshot(base::Bind(
&CaptureRegionMode::OnScreenshotDone, weak_factory_.GetWeakPtr()));
delegate()->HidePalette();
}
@@ -58,7 +58,7 @@ void CaptureRegionMode::OnDisable() {
// If the user manually cancelled the action we need to make sure to cancel
// the screenshot session as well.
- WmShell::Get()->palette_delegate()->CancelPartialScreenshot();
+ Shell::GetInstance()->palette_delegate()->CancelPartialScreenshot();
}
views::View* CaptureRegionMode::CreateView() {
« no previous file with comments | « ash/common/system/chromeos/palette/palette_tray.cc ('k') | ash/common/system/chromeos/palette/tools/capture_screen_action.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698