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

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

Issue 10686005: Add methods to add DataPack from open files (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 8 years, 5 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
« no previous file with comments | « content/shell/shell_main_delegate.cc ('k') | ui/aura/test/test_aura_initializer.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 "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::SCALE_FACTOR_100P) { 14 : data_pack_(ui::SCALE_FACTOR_100P) {
15 FilePath content_resources_pack_path; 15 FilePath content_resources_pack_path;
16 PathService::Get(base::DIR_MODULE, &content_resources_pack_path); 16 PathService::Get(base::DIR_MODULE, &content_resources_pack_path);
17 content_resources_pack_path = content_resources_pack_path.Append( 17 content_resources_pack_path = content_resources_pack_path.Append(
18 FILE_PATH_LITERAL("content_resources.pak")); 18 FILE_PATH_LITERAL("content_resources.pak"));
19 data_pack_.Load(content_resources_pack_path); 19 data_pack_.LoadFromPath(content_resources_pack_path);
20 } 20 }
21 21
22 TestContentClient::~TestContentClient() { 22 TestContentClient::~TestContentClient() {
23 } 23 }
24 24
25 std::string TestContentClient::GetUserAgent() const { 25 std::string TestContentClient::GetUserAgent() const {
26 return std::string("TestContentClient"); 26 return std::string("TestContentClient");
27 } 27 }
28 28
29 base::StringPiece TestContentClient::GetDataResource( 29 base::StringPiece TestContentClient::GetDataResource(
30 int resource_id, 30 int resource_id,
31 ui::ScaleFactor scale_factor) const { 31 ui::ScaleFactor scale_factor) const {
32 base::StringPiece resource; 32 base::StringPiece resource;
33 data_pack_.GetStringPiece(resource_id, &resource); 33 data_pack_.GetStringPiece(resource_id, &resource);
34 return resource; 34 return resource;
35 } 35 }
OLDNEW
« no previous file with comments | « content/shell/shell_main_delegate.cc ('k') | ui/aura/test/test_aura_initializer.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698