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

Side by Side Diff: content/browser/in_process_webkit/dom_storage_area.h

Issue 9271028: android build: progress on content and libjingle. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: simplify conditional to make work on non-Android Created 8 years, 10 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/app/content_main.cc ('k') | content/browser/renderer_host/mock_render_process_host.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) 2011 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2011 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 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_AREA_H_ 5 #ifndef CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_AREA_H_
6 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_AREA_H_ 6 #define CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_AREA_H_
7 #pragma once 7 #pragma once
8 8
9 #include "base/hash_tables.h" 9 #include "base/hash_tables.h"
10 #include "base/memory/ref_counted.h" 10 #include "base/memory/ref_counted.h"
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
53 // Our storage area id. Unique to our parent WebKitContext. 53 // Our storage area id. Unique to our parent WebKitContext.
54 int64 id_; 54 int64 id_;
55 55
56 // The DOMStorageNamespace that owns us. 56 // The DOMStorageNamespace that owns us.
57 DOMStorageNamespace* owner_; 57 DOMStorageNamespace* owner_;
58 58
59 DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageArea); 59 DISALLOW_IMPLICIT_CONSTRUCTORS(DOMStorageArea);
60 }; 60 };
61 61
62 #if defined(COMPILER_GCC) 62 #if defined(COMPILER_GCC)
63 #if defined(OS_ANDROID)
64 // Android stlport uses std namespace
65 namespace std {
66 #else
63 namespace __gnu_cxx { 67 namespace __gnu_cxx {
68 #endif
64 69
65 template<> 70 template<>
66 struct hash<DOMStorageArea*> { 71 struct hash<DOMStorageArea*> {
67 std::size_t operator()(DOMStorageArea* const& p) const { 72 std::size_t operator()(DOMStorageArea* const& p) const {
68 return reinterpret_cast<std::size_t>(p); 73 return reinterpret_cast<std::size_t>(p);
69 } 74 }
70 }; 75 };
71 76
72 } // namespace __gnu_cxx 77 } // namespace __gnu_cxx
73 #endif 78 #endif
74 79
75 #endif // CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_AREA_H_ 80 #endif // CONTENT_BROWSER_IN_PROCESS_WEBKIT_DOM_STORAGE_AREA_H_
OLDNEW
« no previous file with comments | « content/app/content_main.cc ('k') | content/browser/renderer_host/mock_render_process_host.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698