ash/system/palette/common_palette_tool.cc - Issue 2920613003: Clean up unused grit header includes in ash/.

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: ash/system/palette/common_palette_tool.cc

Issue 2920613003: Clean up unused grit header includes in ash/. (Closed)

Patch Set: Created 3 years, 6 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

« no previous file with comments | « ash/system/ime_menu/ime_menu_tray.cc ('k') | ash/system/palette/palette_tray.cc » ('j') | no next file with comments »

OLD	NEW
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/system/palette/common_palette_tool.h"	5 #include "ash/system/palette/common_palette_tool.h"

6	6

7 #include "ash/resources/grit/ash_resources.h"

8 #include "ash/resources/vector_icons/vector_icons.h"	7 #include "ash/resources/vector_icons/vector_icons.h"

9 #include "ash/shelf/shelf_constants.h"	8 #include "ash/shelf/shelf_constants.h"

10 #include "ash/system/palette/palette_ids.h"	9 #include "ash/system/palette/palette_ids.h"

11 #include "ash/system/palette/palette_tool_manager.h"	10 #include "ash/system/palette/palette_tool_manager.h"

12 #include "ash/system/tray/hover_highlight_view.h"	11 #include "ash/system/tray/hover_highlight_view.h"

13 #include "ash/system/tray/tray_constants.h"	12 #include "ash/system/tray/tray_constants.h"

14 #include "ash/system/tray/tray_popup_utils.h"	13 #include "ash/system/tray/tray_popup_utils.h"

15 #include "ash/system/tray/view_click_listener.h"	14 #include "ash/system/tray/view_click_listener.h"

16 #include "base/logging.h"	15 #include "base/logging.h"

17 #include "base/metrics/histogram_macros.h"	16 #include "base/metrics/histogram_macros.h"

(...skipping 61 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
79 views::View* CommonPaletteTool::CreateDefaultView(const base::string16& name) {	78 views::View* CommonPaletteTool::CreateDefaultView(const base::string16& name) {

80 gfx::ImageSkia icon =	79 gfx::ImageSkia icon =

81 CreateVectorIcon(GetPaletteIcon(), kMenuIconSize, gfx::kChromeIconGrey);	80 CreateVectorIcon(GetPaletteIcon(), kMenuIconSize, gfx::kChromeIconGrey);

82 highlight_view_ = new HoverHighlightView(this);	81 highlight_view_ = new HoverHighlightView(this);

83 highlight_view_->AddIconAndLabel(icon, name);	82 highlight_view_->AddIconAndLabel(icon, name);

84 TrayPopupUtils::InitializeAsCheckableRow(highlight_view_, enabled());	83 TrayPopupUtils::InitializeAsCheckableRow(highlight_view_, enabled());

85 return highlight_view_;	84 return highlight_view_;

86 }	85 }

87	86

88 } // namespace ash	87 } // namespace ash

OLD	NEW