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

Side by Side Diff: ash/common/system/chromeos/palette/tools/create_note_action.cc

Issue 2316183003: Move a bunch of ash-only vector icons to ash/. (Closed)
Patch Set: drop the "id". Just "icon". It's cleaner. Created 4 years, 3 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 unified diff | Download patch
OLDNEW
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 "ash/common/system/chromeos/palette/tools/create_note_action.h" 5 #include "ash/common/system/chromeos/palette/tools/create_note_action.h"
6 6
7 #include "ash/common/palette_delegate.h" 7 #include "ash/common/palette_delegate.h"
8 #include "ash/common/system/chromeos/palette/palette_ids.h" 8 #include "ash/common/system/chromeos/palette/palette_ids.h"
9 #include "ash/common/wm_shell.h" 9 #include "ash/common/wm_shell.h"
10 #include "ash/resources/vector_icons/vector_icons.h"
10 #include "grit/ash_strings.h" 11 #include "grit/ash_strings.h"
11 #include "ui/base/l10n/l10n_util.h" 12 #include "ui/base/l10n/l10n_util.h"
12 13
13 namespace ash { 14 namespace ash {
14 15
15 CreateNoteAction::CreateNoteAction(Delegate* delegate) 16 CreateNoteAction::CreateNoteAction(Delegate* delegate)
16 : CommonPaletteTool(delegate) {} 17 : CommonPaletteTool(delegate) {}
17 18
18 CreateNoteAction::~CreateNoteAction() {} 19 CreateNoteAction::~CreateNoteAction() {}
19 20
(...skipping 15 matching lines...) Expand all
35 } 36 }
36 37
37 views::View* CreateNoteAction::CreateView() { 38 views::View* CreateNoteAction::CreateView() {
38 if (!WmShell::Get()->palette_delegate()->HasNoteApp()) 39 if (!WmShell::Get()->palette_delegate()->HasNoteApp())
39 return nullptr; 40 return nullptr;
40 41
41 return CreateDefaultView( 42 return CreateDefaultView(
42 l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_CREATE_NOTE_ACTION)); 43 l10n_util::GetStringUTF16(IDS_ASH_STYLUS_TOOLS_CREATE_NOTE_ACTION));
43 } 44 }
44 45
45 gfx::VectorIconId CreateNoteAction::GetPaletteIconId() { 46 const gfx::VectorIcon& CreateNoteAction::GetPaletteIcon() const {
46 return gfx::VectorIconId::PALETTE_ACTION_CREATE_NOTE; 47 return kPaletteActionCreateNoteIcon;
47 } 48 }
48 49
49 } // namespace ash 50 } // namespace ash
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698