diff options
7 files changed, 12 insertions, 8 deletions
diff --git a/base/debug/leak_tracker.h b/base/debug/leak_tracker.h index a8ea5f4..ec9f5d6 100644 --- a/base/debug/leak_tracker.h +++ b/base/debug/leak_tracker.h @@ -1,4 +1,4 @@ -// Copyright (c) 2010 The Chromium Authors. All rights reserved. +// Copyright (c) 2012 The Chromium Authors. All rights reserved. // Use of this source code is governed by a BSD-style license that can be // found in the LICENSE file. @@ -53,6 +53,7 @@ namespace debug { template<typename T> class LeakTracker { public: + ~LeakTracker() {} static void CheckForLeaks() {} static int NumLiveInstances() { return -1; } }; diff --git a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h index 397e0e3..97c90ff 100644 --- a/chrome/browser/extensions/api/bluetooth/bluetooth_api.h +++ b/chrome/browser/extensions/api/bluetooth/bluetooth_api.h @@ -147,8 +147,8 @@ class BluetoothReadFunction : public AsyncAPIFunction { virtual void Work() OVERRIDE; private: - bool success_; #if defined(OS_CHROMEOS) + bool success_; scoped_refptr<chromeos::BluetoothSocket> socket_; #endif }; @@ -167,9 +167,9 @@ class BluetoothWriteFunction : public AsyncAPIFunction { virtual void Work() OVERRIDE; private: +#if defined(OS_CHROMEOS) bool success_; const base::BinaryValue* data_to_write_; // memory is owned by args_ -#if defined(OS_CHROMEOS) scoped_refptr<chromeos::BluetoothSocket> socket_; #endif }; diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.cc b/chrome/browser/spellchecker/spellcheck_message_filter.cc index 885f59d..bbda114 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter.cc +++ b/chrome/browser/spellchecker/spellcheck_message_filter.cc @@ -19,10 +19,14 @@ using content::BrowserThread; SpellCheckMessageFilter::SpellCheckMessageFilter(int render_process_id) - : render_process_id_(render_process_id), + : render_process_id_(render_process_id) +#if !defined(OS_MACOSX) + , route_id_(0), identifier_(0), - document_tag_(0) { + document_tag_(0) +#endif + { } void SpellCheckMessageFilter::OverrideThreadForMessage( diff --git a/chrome/browser/spellchecker/spellcheck_message_filter.h b/chrome/browser/spellchecker/spellcheck_message_filter.h index ff070a6..e7cb0dd 100644 --- a/chrome/browser/spellchecker/spellcheck_message_filter.h +++ b/chrome/browser/spellchecker/spellcheck_message_filter.h @@ -62,9 +62,11 @@ class SpellCheckMessageFilter : public content::BrowserMessageFilter { // A JSON-RPC client that calls the Spelling service in the background. scoped_ptr<SpellingServiceClient> client_; +#if !defined(OS_MACOSX) int route_id_; int identifier_; int document_tag_; +#endif }; #endif // CHROME_BROWSER_SPELLCHECKER_SPELLCHECK_MESSAGE_FILTER_H_ diff --git a/content/browser/renderer_host/throttling_resource_handler.cc b/content/browser/renderer_host/throttling_resource_handler.cc index 412cadf..b833b7f 100644 --- a/content/browser/renderer_host/throttling_resource_handler.cc +++ b/content/browser/renderer_host/throttling_resource_handler.cc @@ -16,7 +16,6 @@ ThrottlingResourceHandler::ThrottlingResourceHandler( ScopedVector<ResourceThrottle> throttles) : LayeredResourceHandler(next_handler.Pass()), deferred_stage_(DEFERRED_NONE), - child_id_(child_id), request_id_(request_id), throttles_(throttles.Pass()), index_(0) { diff --git a/content/browser/renderer_host/throttling_resource_handler.h b/content/browser/renderer_host/throttling_resource_handler.h index a660f53..8dc0107 100644 --- a/content/browser/renderer_host/throttling_resource_handler.h +++ b/content/browser/renderer_host/throttling_resource_handler.h @@ -55,7 +55,6 @@ class ThrottlingResourceHandler : public LayeredResourceHandler, }; DeferredStage deferred_stage_; - int child_id_; int request_id_; ScopedVector<ResourceThrottle> throttles_; diff --git a/content/renderer/p2p/ipc_network_manager.h b/content/renderer/p2p/ipc_network_manager.h index 9c16a31..17b042a 100644 --- a/content/renderer/p2p/ipc_network_manager.h +++ b/content/renderer/p2p/ipc_network_manager.h @@ -35,7 +35,6 @@ class IpcNetworkManager : public talk_base::NetworkManagerBase, private: void SendNetworksChangedSignal(); - MessageLoop* message_loop_; P2PSocketDispatcher* socket_dispatcher_; int start_count_; bool network_list_received_; |