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

Side by Side Diff: chrome/browser/themes/browser_theme_pack.cc

Issue 2360803002: Remove some pre-MD code from toolbar/tabstrip/frame. (Closed)
Patch Set: couple more Created 4 years, 3 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 (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 "chrome/browser/themes/browser_theme_pack.h" 5 #include "chrome/browser/themes/browser_theme_pack.h"
6 6
7 #include <limits.h> 7 #include <limits.h>
8 #include <stddef.h> 8 #include <stddef.h>
9 9
10 #include <limits> 10 #include <limits>
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 // The rest of these entries have no key because they can't be overridden 148 // The rest of these entries have no key because they can't be overridden
149 // from the json manifest. 149 // from the json manifest.
150 {15, IDR_BACK, NULL}, 150 {15, IDR_BACK, NULL},
151 {16, IDR_BACK_D, NULL}, 151 {16, IDR_BACK_D, NULL},
152 {17, IDR_BACK_H, NULL}, 152 {17, IDR_BACK_H, NULL},
153 {18, IDR_BACK_P, NULL}, 153 {18, IDR_BACK_P, NULL},
154 {19, IDR_FORWARD, NULL}, 154 {19, IDR_FORWARD, NULL},
155 {20, IDR_FORWARD_D, NULL}, 155 {20, IDR_FORWARD_D, NULL},
156 {21, IDR_FORWARD_H, NULL}, 156 {21, IDR_FORWARD_H, NULL},
157 {22, IDR_FORWARD_P, NULL}, 157 {22, IDR_FORWARD_P, NULL},
158 #if defined(OS_MACOSX)
158 {23, IDR_HOME, NULL}, 159 {23, IDR_HOME, NULL},
159 {24, IDR_HOME_H, NULL}, 160 {24, IDR_HOME_H, NULL},
160 {25, IDR_HOME_P, NULL}, 161 {25, IDR_HOME_P, NULL},
162 #endif
Peter Kasting 2016/09/22 23:27:24 So we still use the back/forward/reload/stop bitma
Evan Stade 2016/09/23 00:31:07 yea unfortunately there are still a couple places
161 {26, IDR_RELOAD, NULL}, 163 {26, IDR_RELOAD, NULL},
162 {27, IDR_RELOAD_H, NULL}, 164 {27, IDR_RELOAD_H, NULL},
163 {28, IDR_RELOAD_P, NULL}, 165 {28, IDR_RELOAD_P, NULL},
164 {29, IDR_STOP, NULL}, 166 {29, IDR_STOP, NULL},
165 {30, IDR_STOP_D, NULL}, 167 {30, IDR_STOP_D, NULL},
166 {31, IDR_STOP_H, NULL}, 168 {31, IDR_STOP_H, NULL},
167 {32, IDR_STOP_P, NULL}, 169 {32, IDR_STOP_P, NULL},
168 {33, IDR_TOOLS, NULL}, 170 {33, IDR_TOOLS, NULL},
169 {34, IDR_TOOLS_H, NULL}, 171 {34, IDR_TOOLS_H, NULL},
170 {35, IDR_TOOLS_P, NULL}, 172 {35, IDR_TOOLS_P, NULL},
(...skipping 1370 matching lines...) Expand 10 before | Expand all | Expand 10 after
1541 false, 1543 false,
1542 &bitmap_data)) { 1544 &bitmap_data)) {
1543 NOTREACHED() << "Unable to encode theme image for prs_id=" 1545 NOTREACHED() << "Unable to encode theme image for prs_id="
1544 << prs_id << " for scale_factor=" << scale_factors_[i]; 1546 << prs_id << " for scale_factor=" << scale_factors_[i];
1545 break; 1547 break;
1546 } 1548 }
1547 image_memory_[scaled_raw_id] = 1549 image_memory_[scaled_raw_id] =
1548 base::RefCountedBytes::TakeVector(&bitmap_data); 1550 base::RefCountedBytes::TakeVector(&bitmap_data);
1549 } 1551 }
1550 } 1552 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698