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

Side by Side Diff: app/resource_bundle.cc

Issue 858006: Remove some unnecessary dependencies on net from app/win_util and app/resourc... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | app/win_util.h » ('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) 2006-2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2009 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 "app/resource_bundle.h" 5 #include "app/resource_bundle.h"
6 6
7 #include "app/gfx/codec/png_codec.h" 7 #include "app/gfx/codec/png_codec.h"
8 #include "app/gfx/font.h" 8 #include "app/gfx/font.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/string_piece.h" 10 #include "base/string_piece.h"
11 #include "net/base/file_stream.h"
12 #include "net/base/net_errors.h"
13 #include "third_party/skia/include/core/SkBitmap.h" 11 #include "third_party/skia/include/core/SkBitmap.h"
14 12
15 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL; 13 ResourceBundle* ResourceBundle::g_shared_instance_ = NULL;
16 14
17 /* static */ 15 /* static */
18 // TODO(glen): Finish moving these into theme provider (dialogs still 16 // TODO(glen): Finish moving these into theme provider (dialogs still
19 // depend on these colors). 17 // depend on these colors).
20 const SkColor ResourceBundle::frame_color = 18 const SkColor ResourceBundle::frame_color =
21 SkColorSetRGB(77, 139, 217); 19 SkColorSetRGB(77, 139, 217);
22 const SkColor ResourceBundle::frame_color_inactive = 20 const SkColor ResourceBundle::frame_color_inactive =
(...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after
175 case MediumFont: 173 case MediumFont:
176 return *medium_font_; 174 return *medium_font_;
177 case MediumBoldFont: 175 case MediumBoldFont:
178 return *medium_bold_font_; 176 return *medium_bold_font_;
179 case LargeFont: 177 case LargeFont:
180 return *large_font_; 178 return *large_font_;
181 default: 179 default:
182 return *base_font_; 180 return *base_font_;
183 } 181 }
184 } 182 }
OLDNEW
« no previous file with comments | « no previous file | app/win_util.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698