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

Side by Side Diff: ash/system/tray/hover_highlight_view.cc

Issue 480693002: Use a qualified path for ui_resources.h grit includes. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: REBASE Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « ash/drag_drop/drag_image_view.cc ('k') | ash/system/tray/tray_bar_button_with_title.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright 2012 The Chromium Authors. All rights reserved. 1 // Copyright 2012 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/tray/hover_highlight_view.h" 5 #include "ash/system/tray/hover_highlight_view.h"
6 6
7 #include "ash/system/tray/fixed_sized_image_view.h" 7 #include "ash/system/tray/fixed_sized_image_view.h"
8 #include "ash/system/tray/tray_constants.h" 8 #include "ash/system/tray/tray_constants.h"
9 #include "ash/system/tray/view_click_listener.h" 9 #include "ash/system/tray/view_click_listener.h"
10 #include "grit/ui_resources.h"
11 #include "ui/accessibility/ax_view_state.h" 10 #include "ui/accessibility/ax_view_state.h"
12 #include "ui/base/resource/resource_bundle.h" 11 #include "ui/base/resource/resource_bundle.h"
13 #include "ui/gfx/canvas.h" 12 #include "ui/gfx/canvas.h"
14 #include "ui/gfx/font_list.h" 13 #include "ui/gfx/font_list.h"
14 #include "ui/resources/grit/ui_resources.h"
15 #include "ui/views/border.h" 15 #include "ui/views/border.h"
16 #include "ui/views/controls/image_view.h" 16 #include "ui/views/controls/image_view.h"
17 #include "ui/views/controls/label.h" 17 #include "ui/views/controls/label.h"
18 #include "ui/views/layout/box_layout.h" 18 #include "ui/views/layout/box_layout.h"
19 #include "ui/views/layout/fill_layout.h" 19 #include "ui/views/layout/fill_layout.h"
20 20
21 namespace { 21 namespace {
22 22
23 const int kCheckLabelPadding = 4; 23 const int kCheckLabelPadding = 4;
24 24
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
180 void HoverHighlightView::OnPaintBackground(gfx::Canvas* canvas) { 180 void HoverHighlightView::OnPaintBackground(gfx::Canvas* canvas) {
181 canvas->DrawColor(hover_ ? highlight_color_ : default_color_); 181 canvas->DrawColor(hover_ ? highlight_color_ : default_color_);
182 } 182 }
183 183
184 void HoverHighlightView::OnFocus() { 184 void HoverHighlightView::OnFocus() {
185 ScrollRectToVisible(gfx::Rect(gfx::Point(), size())); 185 ScrollRectToVisible(gfx::Rect(gfx::Point(), size()));
186 ActionableView::OnFocus(); 186 ActionableView::OnFocus();
187 } 187 }
188 188
189 } // namespace ash 189 } // namespace ash
OLDNEW
« no previous file with comments | « ash/drag_drop/drag_image_view.cc ('k') | ash/system/tray/tray_bar_button_with_title.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698