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

Side by Side Diff: content/shell/common/shell_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
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/shell/common/shell_content_client.h" 5 #include "content/shell/common/shell_content_client.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "base/strings/string_piece.h" 8 #include "base/strings/string_piece.h"
9 #include "base/strings/utf_string_conversions.h" 9 #include "base/strings/utf_string_conversions.h"
10 #include "blink/public/resources/grit/blink_image_resources.h" 10 #include "blink/public/resources/grit/blink_image_resources.h"
11 #include "build/build_config.h"
11 #include "content/app/resources/grit/content_resources.h" 12 #include "content/app/resources/grit/content_resources.h"
12 #include "content/app/strings/grit/content_strings.h" 13 #include "content/app/strings/grit/content_strings.h"
13 #include "content/public/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
14 #include "content/public/common/user_agent.h" 15 #include "content/public/common/user_agent.h"
15 #include "content/shell/common/shell_switches.h" 16 #include "content/shell/common/shell_switches.h"
16 #include "grit/shell_resources.h" 17 #include "grit/shell_resources.h"
17 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
18 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
19 20
20 namespace content { 21 namespace content {
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const { 91 gfx::Image& ShellContentClient::GetNativeImageNamed(int resource_id) const {
91 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id); 92 return ResourceBundle::GetSharedInstance().GetNativeImageNamed(resource_id);
92 } 93 }
93 94
94 bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() { 95 bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() {
95 return base::CommandLine::ForCurrentProcess()->HasSwitch( 96 return base::CommandLine::ForCurrentProcess()->HasSwitch(
96 switches::kIsolateSitesForTesting); 97 switches::kIsolateSitesForTesting);
97 } 98 }
98 99
99 } // namespace content 100 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_web_contents_view_delegate.h ('k') | content/shell/renderer/layout_test/blink_test_helpers.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698