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

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

Issue 2732813002: chromeos: Move files in //ash/common to //ash, part 1 (Closed)
Patch Set: rebase 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
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/common_palette_tool.h" 5 #include "ash/system/palette/common_palette_tool.h"
6 6
7 #include "ash/common/shelf/shelf_constants.h" 7 #include "ash/common/shelf/shelf_constants.h"
8 #include "ash/common/system/chromeos/palette/palette_ids.h"
9 #include "ash/common/system/chromeos/palette/palette_tool_manager.h"
10 #include "ash/common/system/tray/hover_highlight_view.h"
11 #include "ash/common/system/tray/tray_constants.h"
12 #include "ash/common/system/tray/view_click_listener.h"
13 #include "ash/resources/grit/ash_resources.h" 8 #include "ash/resources/grit/ash_resources.h"
9 #include "ash/system/palette/palette_ids.h"
10 #include "ash/system/palette/palette_tool_manager.h"
11 #include "ash/system/tray/hover_highlight_view.h"
12 #include "ash/system/tray/tray_constants.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"
19 #include "ui/gfx/paint_vector_icon.h" 19 #include "ui/gfx/paint_vector_icon.h"
20 #include "ui/gfx/vector_icons_public.h" 20 #include "ui/gfx/vector_icons_public.h"
21 #include "ui/views/border.h" 21 #include "ui/views/border.h"
22 #include "ui/views/controls/label.h" 22 #include "ui/views/controls/label.h"
23 23
(...skipping 79 matching lines...) Expand 10 before | Expand all | Expand 10 after
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
OLDNEW
« no previous file with comments | « ash/system/palette/common_palette_tool.h ('k') | ash/system/palette/mock_palette_tool_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698