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

Side by Side Diff: ui/base/cursor/cursors_aura.cc

Issue 1509773003: Minor image-related cleanups. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years 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 (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 "ui/base/cursor/cursors_aura.h" 5 #include "ui/base/cursor/cursors_aura.h"
6 6
7 #include "third_party/skia/include/core/SkBitmap.h" 7 #include "third_party/skia/include/core/SkBitmap.h"
8 #include "ui/base/resource/resource_bundle.h" 8 #include "ui/base/resource/resource_bundle.h"
9 #include "ui/gfx/geometry/point.h" 9 #include "ui/gfx/geometry/point.h"
10 #include "ui/gfx/image/image_skia.h" 10 #include "ui/gfx/image/image_skia.h"
(...skipping 110 matching lines...) Expand 10 before | Expand all | Expand 10 after
121 {29, 32}, {58, 64}}, 121 {29, 32}, {58, 64}},
122 {ui::kCursorNorthEastSouthWestResize, 122 {ui::kCursorNorthEastSouthWestResize,
123 IDR_AURA_CURSOR_BIG_NORTH_EAST_SOUTH_WEST_RESIZE, {32, 30}, {64, 60}}, 123 IDR_AURA_CURSOR_BIG_NORTH_EAST_SOUTH_WEST_RESIZE, {32, 30}, {64, 60}},
124 {ui::kCursorNorthWestSouthEastResize, 124 {ui::kCursorNorthWestSouthEastResize,
125 IDR_AURA_CURSOR_BIG_NORTH_WEST_SOUTH_EAST_RESIZE, {32, 31}, {64, 62}}, 125 IDR_AURA_CURSOR_BIG_NORTH_WEST_SOUTH_EAST_RESIZE, {32, 31}, {64, 62}},
126 {ui::kCursorGrab, IDR_AURA_CURSOR_BIG_GRAB, {21, 11}, {42, 22}}, 126 {ui::kCursorGrab, IDR_AURA_CURSOR_BIG_GRAB, {21, 11}, {42, 22}},
127 {ui::kCursorGrabbing, IDR_AURA_CURSOR_BIG_GRABBING, {20, 12}, {40, 24}}, 127 {ui::kCursorGrabbing, IDR_AURA_CURSOR_BIG_GRABBING, {20, 12}, {40, 24}},
128 }; 128 };
129 129
130 const CursorData kAnimatedCursors[] = { 130 const CursorData kAnimatedCursors[] = {
131 {ui::kCursorWait, IDR_THROBBER, {7, 7}, {14, 14}}, 131 {ui::kCursorWait, IDR_AURA_CURSOR_THROBBER, {7, 7}, {14, 14}},
132 {ui::kCursorProgress, IDR_THROBBER, {7, 7}, {14, 14}}, 132 {ui::kCursorProgress, IDR_AURA_CURSOR_THROBBER, {7, 7}, {14, 14}},
133 }; 133 };
134 134
135 const CursorSet kCursorSets[] = { 135 const CursorSet kCursorSets[] = {
136 { 136 {
137 CURSOR_SET_NORMAL, 137 CURSOR_SET_NORMAL,
138 kNormalCursors, arraysize(kNormalCursors), 138 kNormalCursors, arraysize(kNormalCursors),
139 kAnimatedCursors, arraysize(kAnimatedCursors) 139 kAnimatedCursors, arraysize(kAnimatedCursors)
140 }, 140 },
141 { 141 {
142 CURSOR_SET_LARGE, 142 CURSOR_SET_LARGE,
(...skipping 93 matching lines...) Expand 10 before | Expand all | Expand 10 after
236 236
237 const SkBitmap* cursor_bitmap = ResourceBundle::GetSharedInstance(). 237 const SkBitmap* cursor_bitmap = ResourceBundle::GetSharedInstance().
238 GetImageSkiaNamed(resource_id)->bitmap(); 238 GetImageSkiaNamed(resource_id)->bitmap();
239 if (!cursor_bitmap) 239 if (!cursor_bitmap)
240 return false; 240 return false;
241 *bitmap = *cursor_bitmap; 241 *bitmap = *cursor_bitmap;
242 return true; 242 return true;
243 } 243 }
244 244
245 } // namespace ui 245 } // namespace ui
OLDNEW
« no previous file with comments | « chrome/app/generated_resources.grd ('k') | ui/resources/default_100_percent/common/pointers/throbber.png » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698