ash/system/palette/common_palette_tool.cc - Issue 2736573002: chromeos: Move files in //ash/common to //ash, part 2

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 2736573002: chromeos: Move files in //ash/common to //ash, part 2 (Closed)

Patch Set: 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 unified diff | Download patch

« no previous file with comments | « ash/system/overview/overview_button_tray_unittest.cc ('k') | ash/system/palette/palette_tray.h » ('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/common/shelf/shelf_constants.h"

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

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

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

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

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

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

13 #include "ash/system/tray/view_click_listener.h"	13 #include "ash/system/tray/view_click_listener.h"

14 #include "base/logging.h"	14 #include "base/logging.h"

15 #include "base/metrics/histogram_macros.h"	15 #include "base/metrics/histogram_macros.h"

16 #include "base/strings/utf_string_conversions.h"	16 #include "base/strings/utf_string_conversions.h"

17 #include "ui/base/resource/resource_bundle.h"	17 #include "ui/base/resource/resource_bundle.h"

18 #include "ui/gfx/color_palette.h"	18 #include "ui/gfx/color_palette.h"

(...skipping 84 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
103 } else {	103 } else {

104 highlight_view_->SetRightViewVisible(false);	104 highlight_view_->SetRightViewVisible(false);

105 highlight_view_->SetAccessiblityState(	105 highlight_view_->SetAccessiblityState(

106 HoverHighlightView::AccessibilityState::UNCHECKED_CHECKBOX);	106 HoverHighlightView::AccessibilityState::UNCHECKED_CHECKBOX);

107 }	107 }

108	108

109 return highlight_view_;	109 return highlight_view_;

110 }	110 }

111	111

112 } // namespace ash	112 } // namespace ash

OLD	NEW