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

Unified Diff: ash/common/system/chromeos/palette/tools/create_note_action.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/create_note_action.cc
diff --git a/ash/common/system/chromeos/palette/tools/create_note_action.cc b/ash/common/system/chromeos/palette/tools/create_note_action.cc
index 7cb253355b71840cf84b2b4d3fc92846e18fe334..bbdc25196272dee773c2335757c40022c9dd5acb 100644
--- a/ash/common/system/chromeos/palette/tools/create_note_action.cc
+++ b/ash/common/system/chromeos/palette/tools/create_note_action.cc
@@ -6,8 +6,8 @@
#include "ash/common/palette_delegate.h"
#include "ash/common/system/chromeos/palette/palette_ids.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"
@@ -29,14 +29,14 @@ PaletteToolId CreateNoteAction::GetToolId() const {
void CreateNoteAction::OnEnable() {
CommonPaletteTool::OnEnable();
- WmShell::Get()->palette_delegate()->CreateNote();
+ Shell::GetInstance()->palette_delegate()->CreateNote();
delegate()->DisableTool(GetToolId());
delegate()->HidePalette();
}
views::View* CreateNoteAction::CreateView() {
- if (!WmShell::Get()->palette_delegate()->HasNoteApp())
+ if (!Shell::GetInstance()->palette_delegate()->HasNoteApp())
return nullptr;
return CreateDefaultView(

Powered by Google App Engine
This is Rietveld 408576698