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: chrome/browser/themes/browser_theme_pack.cc

Issue 453213002: IDR_THEME_TAB_BACKGROUND_INCOGNITO should not be defined on Mac. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: 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 | « no previous file | chrome/browser/themes/browser_theme_pack_unittest.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 (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> 7 #include <limits>
8 8
9 #include "base/files/file.h" 9 #include "base/files/file.h"
10 #include "base/memory/ref_counted_memory.h" 10 #include "base/memory/ref_counted_memory.h"
(...skipping 94 matching lines...) Expand 10 before | Expand all | Expand 10 after
105 { PRS_THEME_FRAME_INACTIVE, IDR_THEME_FRAME_INACTIVE, 105 { PRS_THEME_FRAME_INACTIVE, IDR_THEME_FRAME_INACTIVE,
106 "theme_frame_inactive" }, 106 "theme_frame_inactive" },
107 { PRS_THEME_FRAME_INCOGNITO, IDR_THEME_FRAME_INCOGNITO, 107 { PRS_THEME_FRAME_INCOGNITO, IDR_THEME_FRAME_INCOGNITO,
108 "theme_frame_incognito" }, 108 "theme_frame_incognito" },
109 { PRS_THEME_FRAME_INCOGNITO_INACTIVE, IDR_THEME_FRAME_INCOGNITO_INACTIVE, 109 { PRS_THEME_FRAME_INCOGNITO_INACTIVE, IDR_THEME_FRAME_INCOGNITO_INACTIVE,
110 "theme_frame_incognito_inactive" }, 110 "theme_frame_incognito_inactive" },
111 { PRS_THEME_TOOLBAR, IDR_THEME_TOOLBAR, 111 { PRS_THEME_TOOLBAR, IDR_THEME_TOOLBAR,
112 "theme_toolbar" }, 112 "theme_toolbar" },
113 { PRS_THEME_TAB_BACKGROUND, IDR_THEME_TAB_BACKGROUND, 113 { PRS_THEME_TAB_BACKGROUND, IDR_THEME_TAB_BACKGROUND,
114 "theme_tab_background" }, 114 "theme_tab_background" },
115 #if !defined(OS_MACOSX)
115 { PRS_THEME_TAB_BACKGROUND_INCOGNITO, IDR_THEME_TAB_BACKGROUND_INCOGNITO, 116 { PRS_THEME_TAB_BACKGROUND_INCOGNITO, IDR_THEME_TAB_BACKGROUND_INCOGNITO,
116 "theme_tab_background_incognito" }, 117 "theme_tab_background_incognito" },
118 #endif
117 { PRS_THEME_TAB_BACKGROUND_V, IDR_THEME_TAB_BACKGROUND_V, 119 { PRS_THEME_TAB_BACKGROUND_V, IDR_THEME_TAB_BACKGROUND_V,
118 "theme_tab_background_v"}, 120 "theme_tab_background_v"},
119 { PRS_THEME_NTP_BACKGROUND, IDR_THEME_NTP_BACKGROUND, 121 { PRS_THEME_NTP_BACKGROUND, IDR_THEME_NTP_BACKGROUND,
120 "theme_ntp_background" }, 122 "theme_ntp_background" },
121 { PRS_THEME_FRAME_OVERLAY, IDR_THEME_FRAME_OVERLAY, 123 { PRS_THEME_FRAME_OVERLAY, IDR_THEME_FRAME_OVERLAY,
122 "theme_frame_overlay" }, 124 "theme_frame_overlay" },
123 { PRS_THEME_FRAME_OVERLAY_INACTIVE, IDR_THEME_FRAME_OVERLAY_INACTIVE, 125 { PRS_THEME_FRAME_OVERLAY_INACTIVE, IDR_THEME_FRAME_OVERLAY_INACTIVE,
124 "theme_frame_overlay_inactive" }, 126 "theme_frame_overlay_inactive" },
125 { PRS_THEME_BUTTON_BACKGROUND, IDR_THEME_BUTTON_BACKGROUND, 127 { PRS_THEME_BUTTON_BACKGROUND, IDR_THEME_BUTTON_BACKGROUND,
126 "theme_button_background" }, 128 "theme_button_background" },
(...skipping 1484 matching lines...) Expand 10 before | Expand all | Expand 10 after
1611 false, 1613 false,
1612 &bitmap_data)) { 1614 &bitmap_data)) {
1613 NOTREACHED() << "Unable to encode theme image for prs_id=" 1615 NOTREACHED() << "Unable to encode theme image for prs_id="
1614 << prs_id << " for scale_factor=" << scale_factors_[i]; 1616 << prs_id << " for scale_factor=" << scale_factors_[i];
1615 break; 1617 break;
1616 } 1618 }
1617 image_memory_[scaled_raw_id] = 1619 image_memory_[scaled_raw_id] =
1618 base::RefCountedBytes::TakeVector(&bitmap_data); 1620 base::RefCountedBytes::TakeVector(&bitmap_data);
1619 } 1621 }
1620 } 1622 }
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/themes/browser_theme_pack_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698