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

Side by Side Diff: app/resource_bundle.h

Issue 2852011: Revert 50057 - Load net-internals from the newly created resources.pak file.... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years, 6 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/resource_bundle.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) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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 #ifndef APP_RESOURCE_BUNDLE_H_ 5 #ifndef APP_RESOURCE_BUNDLE_H_
6 #define APP_RESOURCE_BUNDLE_H_ 6 #define APP_RESOURCE_BUNDLE_H_
7 7
8 #include "build/build_config.h" 8 #include "build/build_config.h"
9 9
10 #if defined(OS_WIN) 10 #if defined(OS_WIN)
(...skipping 141 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 static const SkColor frame_color_app_panel_inactive; 152 static const SkColor frame_color_app_panel_inactive;
153 static const SkColor frame_color_incognito; 153 static const SkColor frame_color_incognito;
154 static const SkColor frame_color_incognito_inactive; 154 static const SkColor frame_color_incognito_inactive;
155 static const SkColor toolbar_color; 155 static const SkColor toolbar_color;
156 static const SkColor toolbar_separator_color; 156 static const SkColor toolbar_separator_color;
157 157
158 private: 158 private:
159 // Helper class for managing data packs. 159 // Helper class for managing data packs.
160 class LoadedDataPack { 160 class LoadedDataPack {
161 public: 161 public:
162 explicit LoadedDataPack(const FilePath& path); 162 LoadedDataPack(const FilePath& path);
163 bool GetStringPiece(int resource_id, base::StringPiece* data) const; 163 bool GetStringPiece(int resource_id, base::StringPiece* data);
164 RefCountedStaticMemory* GetStaticMemory(int resource_id) const;
165 164
166 private: 165 private:
167 void Load(); 166 void Load();
168 167
169 scoped_ptr<base::DataPack> data_pack_; 168 scoped_ptr<base::DataPack> data_pack_;
170 FilePath path_; 169 FilePath path_;
171 170
172 DISALLOW_COPY_AND_ASSIGN(LoadedDataPack); 171 DISALLOW_COPY_AND_ASSIGN(LoadedDataPack);
173 }; 172 };
174 173
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
258 scoped_ptr<gfx::Font> medium_bold_font_; 257 scoped_ptr<gfx::Font> medium_bold_font_;
259 scoped_ptr<gfx::Font> large_font_; 258 scoped_ptr<gfx::Font> large_font_;
260 scoped_ptr<gfx::Font> web_font_; 259 scoped_ptr<gfx::Font> web_font_;
261 260
262 static ResourceBundle* g_shared_instance_; 261 static ResourceBundle* g_shared_instance_;
263 262
264 DISALLOW_COPY_AND_ASSIGN(ResourceBundle); 263 DISALLOW_COPY_AND_ASSIGN(ResourceBundle);
265 }; 264 };
266 265
267 #endif // APP_RESOURCE_BUNDLE_H_ 266 #endif // APP_RESOURCE_BUNDLE_H_
OLDNEW
« no previous file with comments | « no previous file | app/resource_bundle.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698