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

Side by Side Diff: content/common/sandbox_mac.mm

Issue 492813002: Use a qualified path for grit/content_resources.h. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | « content/browser/webui/web_ui_mojo_browsertest.cc ('k') | content/content_resources.gyp » ('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/common/sandbox_mac.h" 5 #include "content/common/sandbox_mac.h"
6 6
7 #import <Cocoa/Cocoa.h> 7 #import <Cocoa/Cocoa.h>
8 8
9 #include <CoreFoundation/CFTimeZone.h> 9 #include <CoreFoundation/CFTimeZone.h>
10 extern "C" { 10 extern "C" {
(...skipping 13 matching lines...) Expand all
24 #include "base/mac/scoped_nsautorelease_pool.h" 24 #include "base/mac/scoped_nsautorelease_pool.h"
25 #include "base/mac/scoped_nsobject.h" 25 #include "base/mac/scoped_nsobject.h"
26 #include "base/rand_util.h" 26 #include "base/rand_util.h"
27 #include "base/strings/string16.h" 27 #include "base/strings/string16.h"
28 #include "base/strings/string_piece.h" 28 #include "base/strings/string_piece.h"
29 #include "base/strings/string_util.h" 29 #include "base/strings/string_util.h"
30 #include "base/strings/stringprintf.h" 30 #include "base/strings/stringprintf.h"
31 #include "base/strings/sys_string_conversions.h" 31 #include "base/strings/sys_string_conversions.h"
32 #include "base/strings/utf_string_conversions.h" 32 #include "base/strings/utf_string_conversions.h"
33 #include "base/sys_info.h" 33 #include "base/sys_info.h"
34 #include "content/grit/content_resources.h"
34 #include "content/public/common/content_client.h" 35 #include "content/public/common/content_client.h"
35 #include "content/public/common/content_switches.h" 36 #include "content/public/common/content_switches.h"
36 #include "grit/content_resources.h"
37 #include "third_party/icu/source/common/unicode/uchar.h" 37 #include "third_party/icu/source/common/unicode/uchar.h"
38 #include "ui/base/layout.h" 38 #include "ui/base/layout.h"
39 #include "ui/gl/gl_surface.h" 39 #include "ui/gl/gl_surface.h"
40 40
41 namespace content { 41 namespace content {
42 namespace { 42 namespace {
43 43
44 // Is the sandbox currently active. 44 // Is the sandbox currently active.
45 bool gSandboxIsActive = false; 45 bool gSandboxIsActive = false;
46 46
(...skipping 567 matching lines...) Expand 10 before | Expand all | Expand 10 after
614 if (HANDLE_EINTR(fcntl(fd.get(), F_GETPATH, canonical_path)) != 0) { 614 if (HANDLE_EINTR(fcntl(fd.get(), F_GETPATH, canonical_path)) != 0) {
615 DPLOG(FATAL) << "GetCanonicalSandboxPath() failed for: " 615 DPLOG(FATAL) << "GetCanonicalSandboxPath() failed for: "
616 << path.value(); 616 << path.value();
617 return path; 617 return path;
618 } 618 }
619 619
620 return base::FilePath(canonical_path); 620 return base::FilePath(canonical_path);
621 } 621 }
622 622
623 } // namespace content 623 } // namespace content
OLDNEW
« no previous file with comments | « content/browser/webui/web_ui_mojo_browsertest.cc ('k') | content/content_resources.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698