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

Side by Side Diff: content/test/test_content_client.cc

Issue 10151025: Add scale factor tag to data packs (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 8 years, 7 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 | « chrome_frame/simple_resource_loader.cc ('k') | ui/base/resource/data_pack.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) 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 "content/test/test_content_client.h" 5 #include "content/test/test_content_client.h"
6 6
7 #include "base/base_paths.h" 7 #include "base/base_paths.h"
8 #include "base/file_path.h" 8 #include "base/file_path.h"
9 #include "base/logging.h" 9 #include "base/logging.h"
10 #include "base/path_service.h" 10 #include "base/path_service.h"
11 #include "base/string_piece.h" 11 #include "base/string_piece.h"
12 12
13 TestContentClient::TestContentClient() { 13 TestContentClient::TestContentClient()
14 : data_pack_(ui::ResourceHandle::kScaleFactor100x) {
14 FilePath content_resources_pack_path; 15 FilePath content_resources_pack_path;
15 PathService::Get(base::DIR_MODULE, &content_resources_pack_path); 16 PathService::Get(base::DIR_MODULE, &content_resources_pack_path);
16 content_resources_pack_path = content_resources_pack_path.Append( 17 content_resources_pack_path = content_resources_pack_path.Append(
17 FILE_PATH_LITERAL("content_resources.pak")); 18 FILE_PATH_LITERAL("content_resources.pak"));
18 data_pack_.Load(content_resources_pack_path); 19 data_pack_.Load(content_resources_pack_path);
19 } 20 }
20 21
21 TestContentClient::~TestContentClient() { 22 TestContentClient::~TestContentClient() {
22 } 23 }
23 24
(...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 } 71 }
71 #endif 72 #endif
72 73
73 #if defined(OS_MACOSX) 74 #if defined(OS_MACOSX)
74 bool TestContentClient::GetSandboxProfileForSandboxType( 75 bool TestContentClient::GetSandboxProfileForSandboxType(
75 int sandbox_type, 76 int sandbox_type,
76 int* sandbox_profile_resource_id) const { 77 int* sandbox_profile_resource_id) const {
77 return false; 78 return false;
78 } 79 }
79 #endif 80 #endif
OLDNEW
« no previous file with comments | « chrome_frame/simple_resource_loader.cc ('k') | ui/base/resource/data_pack.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698