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

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

Issue 1544273002: Switch to standard integer types in content/. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 12 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/test/test_content_client.h ('k') | content/test/test_frame_navigation_observer.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/files/file_path.h" 8 #include "base/files/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/strings/string_piece.h" 11 #include "base/strings/string_piece.h"
12 #include "build/build_config.h"
12 13
13 #if defined(OS_ANDROID) 14 #if defined(OS_ANDROID)
14 #include "base/android/apk_assets.h" 15 #include "base/android/apk_assets.h"
15 #endif 16 #endif
16 17
17 namespace content { 18 namespace content {
18 19
19 TestContentClient::TestContentClient() 20 TestContentClient::TestContentClient()
20 : data_pack_(ui::SCALE_FACTOR_100P) { 21 : data_pack_(ui::SCALE_FACTOR_100P) {
21 // content_shell.pak is not built on iOS as it is not required. 22 // content_shell.pak is not built on iOS as it is not required.
(...skipping 34 matching lines...) Expand 10 before | Expand all | Expand 10 after
56 57
57 base::StringPiece TestContentClient::GetDataResource( 58 base::StringPiece TestContentClient::GetDataResource(
58 int resource_id, 59 int resource_id,
59 ui::ScaleFactor scale_factor) const { 60 ui::ScaleFactor scale_factor) const {
60 base::StringPiece resource; 61 base::StringPiece resource;
61 data_pack_.GetStringPiece(resource_id, &resource); 62 data_pack_.GetStringPiece(resource_id, &resource);
62 return resource; 63 return resource;
63 } 64 }
64 65
65 } // namespace content 66 } // namespace content
OLDNEW
« no previous file with comments | « content/test/test_content_client.h ('k') | content/test/test_frame_navigation_observer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698