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

Side by Side Diff: content/shell/common/shell_content_client.cc

Issue 2719823002: grit: Absolute includes for shell_resources.h (Closed)
Patch Set: Created 3 years, 9 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/browser/shell_devtools_manager_delegate.cc ('k') | no next file » | 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/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 "build/build_config.h"
12 #include "content/app/resources/grit/content_resources.h" 12 #include "content/app/resources/grit/content_resources.h"
13 #include "content/app/strings/grit/content_strings.h" 13 #include "content/app/strings/grit/content_strings.h"
14 #include "content/public/common/content_switches.h" 14 #include "content/public/common/content_switches.h"
15 #include "content/public/common/user_agent.h" 15 #include "content/public/common/user_agent.h"
16 #include "content/shell/common/shell_switches.h" 16 #include "content/shell/common/shell_switches.h"
17 #include "grit/shell_resources.h" 17 #include "content/shell/grit/shell_resources.h"
18 #include "ui/base/l10n/l10n_util.h" 18 #include "ui/base/l10n/l10n_util.h"
19 #include "ui/base/resource/resource_bundle.h" 19 #include "ui/base/resource/resource_bundle.h"
20 20
21 namespace content { 21 namespace content {
22 22
23 std::string GetShellUserAgent() { 23 std::string GetShellUserAgent() {
24 std::string product = "Chrome/" CONTENT_SHELL_VERSION; 24 std::string product = "Chrome/" CONTENT_SHELL_VERSION;
25 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess(); 25 base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
26 if (command_line->HasSwitch(switches::kUseMobileUserAgent)) 26 if (command_line->HasSwitch(switches::kUseMobileUserAgent))
27 product += " Mobile"; 27 product += " Mobile";
(...skipping 66 matching lines...) Expand 10 before | Expand all | Expand 10 after
94 bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() { 94 bool ShellContentClient::IsSupplementarySiteIsolationModeEnabled() {
95 return base::CommandLine::ForCurrentProcess()->HasSwitch( 95 return base::CommandLine::ForCurrentProcess()->HasSwitch(
96 switches::kIsolateSitesForTesting); 96 switches::kIsolateSitesForTesting);
97 } 97 }
98 98
99 OriginTrialPolicy* ShellContentClient::GetOriginTrialPolicy() { 99 OriginTrialPolicy* ShellContentClient::GetOriginTrialPolicy() {
100 return &origin_trial_policy_; 100 return &origin_trial_policy_;
101 } 101 }
102 102
103 } // namespace content 103 } // namespace content
OLDNEW
« no previous file with comments | « content/shell/browser/shell_devtools_manager_delegate.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698