summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--base/linux_util.cc2
-rw-r--r--base/nix/mime_util_xdg.cc6
-rw-r--r--base/path_service.cc10
-rw-r--r--base/tracked_objects.cc8
-rw-r--r--chrome/browser/sync/engine/syncer_proto_util.cc3
-rw-r--r--chrome/browser/sync/syncable/syncable.cc5
-rw-r--r--chrome/service/cloud_print/print_system_cups.cc13
-rw-r--r--content/renderer/gpu/renderer_gl_context.cc4
-rw-r--r--content/renderer/media/media_stream_impl.cc6
-rw-r--r--content/renderer/render_thread_impl.cc11
-rw-r--r--media/audio/linux/alsa_output.cc2
-rw-r--r--printing/backend/print_backend_cups.cc2
-rw-r--r--printing/printed_document.cc2
-rw-r--r--printing/printing_context_gtk.cc10
-rw-r--r--remoting/client/chromoting_stats.cc4
-rw-r--r--remoting/protocol/jingle_messages.cc4
-rw-r--r--webkit/plugins/npapi/plugin_list.cc2
-rw-r--r--webkit/plugins/npapi/webplugin_impl.cc11
-rw-r--r--webkit/plugins/ppapi/ppapi_plugin_instance.cc8
19 files changed, 60 insertions, 53 deletions
diff --git a/base/linux_util.cc b/base/linux_util.cc
index 247580d..0a9ef56 100644
--- a/base/linux_util.cc
+++ b/base/linux_util.cc
@@ -73,7 +73,7 @@ class LinuxDistroHelper {
#endif // if defined(OS_LINUX)
// expected prefix of the target of the /proc/self/fd/%d link for a socket
-static const char kSocketLinkPrefix[] = "socket:[";
+const char kSocketLinkPrefix[] = "socket:[";
// Parse a symlink in /proc/pid/fd/$x and return the inode number of the
// socket.
diff --git a/base/nix/mime_util_xdg.cc b/base/nix/mime_util_xdg.cc
index 8d21d52..6cd5945 100644
--- a/base/nix/mime_util_xdg.cc
+++ b/base/nix/mime_util_xdg.cc
@@ -31,13 +31,13 @@
namespace {
+class IconTheme;
+
// None of the XDG stuff is thread-safe, so serialize all access under
// this lock.
-static base::LazyInstance<base::Lock>::Leaky
+base::LazyInstance<base::Lock>::Leaky
g_mime_util_xdg_lock = LAZY_INSTANCE_INITIALIZER;
-class IconTheme;
-
class MimeUtilConstants {
public:
typedef std::map<std::string, IconTheme*> IconThemeMap;
diff --git a/base/path_service.cc b/base/path_service.cc
index 47278c3..46f394c 100644
--- a/base/path_service.cc
+++ b/base/path_service.cc
@@ -46,7 +46,7 @@ struct Provider {
bool is_static;
};
-static Provider base_provider = {
+Provider base_provider = {
base::PathProvider,
NULL,
#ifndef NDEBUG
@@ -57,7 +57,7 @@ static Provider base_provider = {
};
#if defined(OS_WIN)
-static Provider base_provider_win = {
+Provider base_provider_win = {
base::PathProviderWin,
&base_provider,
#ifndef NDEBUG
@@ -69,7 +69,7 @@ static Provider base_provider_win = {
#endif
#if defined(OS_MACOSX)
-static Provider base_provider_mac = {
+Provider base_provider_mac = {
base::PathProviderMac,
&base_provider,
#ifndef NDEBUG
@@ -81,7 +81,7 @@ static Provider base_provider_mac = {
#endif
#if defined(OS_ANDROID)
-static Provider base_provider_android = {
+Provider base_provider_android = {
base::PathProviderAndroid,
&base_provider,
#ifndef NDEBUG
@@ -93,7 +93,7 @@ static Provider base_provider_android = {
#endif
#if defined(OS_POSIX) && !defined(OS_MACOSX) && !defined(OS_ANDROID)
-static Provider base_provider_posix = {
+Provider base_provider_posix = {
base::PathProviderPosix,
&base_provider,
#ifndef NDEBUG
diff --git a/base/tracked_objects.cc b/base/tracked_objects.cc
index 884cd56..71b3bc6 100644
--- a/base/tracked_objects.cc
+++ b/base/tracked_objects.cc
@@ -19,11 +19,12 @@ using base::TimeDelta;
namespace tracked_objects {
namespace {
+
// Flag to compile out almost all of the task tracking code.
-static const bool kTrackAllTaskObjects = true;
+const bool kTrackAllTaskObjects = true;
// Flag to compile out parent-child link recording.
-static const bool kTrackParentChildLinks = false;
+const bool kTrackParentChildLinks = false;
// When ThreadData is first initialized, should we start in an ACTIVE state to
// record all of the startup-time tasks, or should we start up DEACTIVATED, so
@@ -31,8 +32,9 @@ static const bool kTrackParentChildLinks = false;
// Note that the flag may force either state, so this really controls only the
// period of time up until that flag is parsed. If there is no flag seen, then
// this state may prevail for much or all of the process lifetime.
-static const ThreadData::Status kInitialStartupState =
+const ThreadData::Status kInitialStartupState =
ThreadData::PROFILING_CHILDREN_ACTIVE;
+
} // namespace
//------------------------------------------------------------------------------
diff --git a/chrome/browser/sync/engine/syncer_proto_util.cc b/chrome/browser/sync/engine/syncer_proto_util.cc
index 7810c60..e005a64 100644
--- a/chrome/browser/sync/engine/syncer_proto_util.cc
+++ b/chrome/browser/sync/engine/syncer_proto_util.cc
@@ -39,7 +39,8 @@ using sessions::SyncSession;
namespace {
// Time to backoff syncing after receiving a throttled response.
-static const int kSyncDelayAfterThrottled = 2 * 60 * 60; // 2 hours
+const int kSyncDelayAfterThrottled = 2 * 60 * 60; // 2 hours
+
void LogResponseProfilingData(const ClientToServerResponse& response) {
if (response.has_profiling_data()) {
stringstream response_trace;
diff --git a/chrome/browser/sync/syncable/syncable.cc b/chrome/browser/sync/syncable/syncable.cc
index b7277c6..949b712 100644
--- a/chrome/browser/sync/syncable/syncable.cc
+++ b/chrome/browser/sync/syncable/syncable.cc
@@ -45,16 +45,17 @@
#include "net/base/escape.h"
namespace {
+
enum InvariantCheckLevel {
OFF = 0,
VERIFY_IN_MEMORY = 1,
FULL_DB_VERIFICATION = 2
};
-static const InvariantCheckLevel kInvariantCheckLevel = VERIFY_IN_MEMORY;
+const InvariantCheckLevel kInvariantCheckLevel = VERIFY_IN_MEMORY;
// Max number of milliseconds to spend checking syncable entry invariants
-static const int kInvariantCheckMaxMs = 50;
+const int kInvariantCheckMaxMs = 50;
// This function checks to see if the given list of Metahandles has any nodes
// whose PREV_ID, PARENT_ID or NEXT_ID values refer to ID values that do not
diff --git a/chrome/service/cloud_print/print_system_cups.cc b/chrome/service/cloud_print/print_system_cups.cc
index 1371a0b..e773771 100644
--- a/chrome/service/cloud_print/print_system_cups.cc
+++ b/chrome/service/cloud_print/print_system_cups.cc
@@ -35,17 +35,18 @@
#include "ui/base/l10n/l10n_util.h"
namespace {
+
// CUPS specific options.
-static const char kCUPSPrinterInfoOpt[] = "printer-info";
-static const char kCUPSPrinterStateOpt[] = "printer-state";
+const char kCUPSPrinterInfoOpt[] = "printer-info";
+const char kCUPSPrinterStateOpt[] = "printer-state";
// Print system config options.
-static const char kCUPSPrintServerURLs[] = "print_server_urls";
-static const char kCUPSUpdateTimeoutMs[] = "update_timeout_ms";
-static const char kCUPSNotifyDelete[] = "notify_delete";
+const char kCUPSPrintServerURLs[] = "print_server_urls";
+const char kCUPSUpdateTimeoutMs[] = "update_timeout_ms";
+const char kCUPSNotifyDelete[] = "notify_delete";
// Default port for IPP print servers.
-static const int kDefaultIPPServerPort = 631;
+const int kDefaultIPPServerPort = 631;
// Time interval to check for printer's updates.
const int kCheckForPrinterUpdatesMs = 5*60*1000;
diff --git a/content/renderer/gpu/renderer_gl_context.cc b/content/renderer/gpu/renderer_gl_context.cc
index 04cab30..6440271 100644
--- a/content/renderer/gpu/renderer_gl_context.cc
+++ b/content/renderer/gpu/renderer_gl_context.cc
@@ -53,7 +53,7 @@ class GLES2Initializer {
////////////////////////////////////////////////////////////////////////////////
-static base::LazyInstance<GLES2Initializer> g_gles2_initializer =
+base::LazyInstance<GLES2Initializer> g_gles2_initializer =
LAZY_INSTANCE_INITIALIZER;
////////////////////////////////////////////////////////////////////////////////
@@ -74,7 +74,7 @@ RendererGLContext::ContextLostReason ConvertReason(
}
#endif
-} // namespace anonymous
+} // namespace
RendererGLContext::~RendererGLContext() {
Destroy();
diff --git a/content/renderer/media/media_stream_impl.cc b/content/renderer/media/media_stream_impl.cc
index 2ee5221..3236a1f 100644
--- a/content/renderer/media/media_stream_impl.cc
+++ b/content/renderer/media/media_stream_impl.cc
@@ -33,9 +33,9 @@
namespace {
-static const int kVideoCaptureWidth = 352;
-static const int kVideoCaptureHeight = 288;
-static const int kVideoCaptureFramePerSecond = 30;
+const int kVideoCaptureWidth = 352;
+const int kVideoCaptureHeight = 288;
+const int kVideoCaptureFramePerSecond = 30;
} // namespace
diff --git a/content/renderer/render_thread_impl.cc b/content/renderer/render_thread_impl.cc
index f0084bd..c9f4099 100644
--- a/content/renderer/render_thread_impl.cc
+++ b/content/renderer/render_thread_impl.cc
@@ -101,14 +101,15 @@ using WebKit::WebView;
using content::RenderProcessObserver;
namespace {
-static const int64 kInitialIdleHandlerDelayMs = 1000;
-static const int64 kShortIdleHandlerDelayMs = 1000;
-static const int64 kLongIdleHandlerDelayMs = 30*1000;
-static const int kIdleCPUUsageThresholdInPercents = 3;
+
+const int64 kInitialIdleHandlerDelayMs = 1000;
+const int64 kShortIdleHandlerDelayMs = 1000;
+const int64 kLongIdleHandlerDelayMs = 30*1000;
+const int kIdleCPUUsageThresholdInPercents = 3;
// Keep the global RenderThreadImpl in a TLS slot so it is impossible to access
// incorrectly from the wrong thread.
-static base::LazyInstance<base::ThreadLocalPointer<RenderThreadImpl> >
+base::LazyInstance<base::ThreadLocalPointer<RenderThreadImpl> >
lazy_tls = LAZY_INSTANCE_INITIALIZER;
class RenderViewZoomer : public content::RenderViewVisitor {
diff --git a/media/audio/linux/alsa_output.cc b/media/audio/linux/alsa_output.cc
index 75de924..0cc5280 100644
--- a/media/audio/linux/alsa_output.cc
+++ b/media/audio/linux/alsa_output.cc
@@ -49,7 +49,6 @@
#include "media/base/data_buffer.h"
#include "media/base/seekable_buffer.h"
-namespace {
// Amount of time to wait if we've exhausted the data source. This is to avoid
// busy looping.
static const uint32 kNoDataSleepMilliseconds = 10;
@@ -143,7 +142,6 @@ static void Swizzle51Layout(Format* b, uint32 filled) {
b[5] = aac[5]; // LFE
}
}
-} // end namespace
std::ostream& operator<<(std::ostream& os,
AlsaPcmOutputStream::InternalState state) {
diff --git a/printing/backend/print_backend_cups.cc b/printing/backend/print_backend_cups.cc
index 19275c1..d543389 100644
--- a/printing/backend/print_backend_cups.cc
+++ b/printing/backend/print_backend_cups.cc
@@ -87,7 +87,7 @@ class GcryptInitializer {
}
};
-static base::LazyInstance<GcryptInitializer> g_gcrypt_initializer =
+base::LazyInstance<GcryptInitializer> g_gcrypt_initializer =
LAZY_INSTANCE_INITIALIZER;
} // namespace
diff --git a/printing/printed_document.cc b/printing/printed_document.cc
index c4f2254..7686055 100644
--- a/printing/printed_document.cc
+++ b/printing/printed_document.cc
@@ -37,7 +37,7 @@ struct PrintDebugDumpPath {
FilePath debug_dump_path;
};
-static base::LazyInstance<PrintDebugDumpPath> g_debug_dump_info =
+base::LazyInstance<PrintDebugDumpPath> g_debug_dump_info =
LAZY_INSTANCE_INITIALIZER;
} // namespace
diff --git a/printing/printing_context_gtk.cc b/printing/printing_context_gtk.cc
index 88e57e6..af97906 100644
--- a/printing/printing_context_gtk.cc
+++ b/printing/printing_context_gtk.cc
@@ -15,10 +15,12 @@
#include "printing/units.h"
namespace {
- // Function pointer for creating print dialogs. |callback| is only used when
- // |show_dialog| is true.
- static printing::PrintDialogGtkInterface* (*create_dialog_func_)(
- printing::PrintingContextGtk* context) = NULL;
+
+// Function pointer for creating print dialogs. |callback| is only used when
+// |show_dialog| is true.
+printing::PrintDialogGtkInterface* (*create_dialog_func_)(
+ printing::PrintingContextGtk* context) = NULL;
+
} // namespace
namespace printing {
diff --git a/remoting/client/chromoting_stats.cc b/remoting/client/chromoting_stats.cc
index 604319d..71b7199 100644
--- a/remoting/client/chromoting_stats.cc
+++ b/remoting/client/chromoting_stats.cc
@@ -7,10 +7,10 @@
namespace {
// The default window of bandwidth and frame rate in seconds.
-static const int kTimeWindow = 3;
+const int kTimeWindow = 3;
// We take the last 10 latency numbers and report the average.
-static const int kLatencyWindow = 10;
+const int kLatencyWindow = 10;
} // namespace
diff --git a/remoting/protocol/jingle_messages.cc b/remoting/protocol/jingle_messages.cc
index 1e70a2b..9684cab 100644
--- a/remoting/protocol/jingle_messages.cc
+++ b/remoting/protocol/jingle_messages.cc
@@ -55,7 +55,7 @@ T NameToValue(const NameMapElement<T> map[], size_t map_size,
return default_value;
}
-static const NameMapElement<JingleMessage::ActionType> kActionTypes[] = {
+const NameMapElement<JingleMessage::ActionType> kActionTypes[] = {
{ JingleMessage::SESSION_INITIATE, "session-initiate" },
{ JingleMessage::SESSION_ACCEPT, "session-accept" },
{ JingleMessage::SESSION_TERMINATE, "session-terminate" },
@@ -63,7 +63,7 @@ static const NameMapElement<JingleMessage::ActionType> kActionTypes[] = {
{ JingleMessage::TRANSPORT_INFO, "transport-info" },
};
-static const NameMapElement<JingleMessage::Reason> kReasons[] = {
+const NameMapElement<JingleMessage::Reason> kReasons[] = {
{ JingleMessage::SUCCESS, "success" },
{ JingleMessage::DECLINE, "decline" },
{ JingleMessage::GENERAL_ERROR, "general-error" },
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index f13e1ea..c526efb 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -22,7 +22,7 @@
namespace {
-static const char kApplicationOctetStream[] = "application/octet-stream";
+const char kApplicationOctetStream[] = "application/octet-stream";
base::LazyInstance<webkit::npapi::PluginList> g_singleton =
LAZY_INSTANCE_INITIALIZER;
diff --git a/webkit/plugins/npapi/webplugin_impl.cc b/webkit/plugins/npapi/webplugin_impl.cc
index 4e8f60f..4049596 100644
--- a/webkit/plugins/npapi/webplugin_impl.cc
+++ b/webkit/plugins/npapi/webplugin_impl.cc
@@ -81,11 +81,12 @@ namespace npapi {
namespace {
-static const char kFlashMimeType[] = "application/x-shockwave-flash";
-static const char kOctetStreamMimeType[] = "application/octet-stream";
-static const char kHTMLMimeType[] = "text/html";
-static const char kPlainTextMimeType[] = "text/plain";
-static const char kPluginFlashMimeType[] = "Plugin.FlashMIMEType";
+const char kFlashMimeType[] = "application/x-shockwave-flash";
+const char kOctetStreamMimeType[] = "application/octet-stream";
+const char kHTMLMimeType[] = "text/html";
+const char kPlainTextMimeType[] = "text/plain";
+const char kPluginFlashMimeType[] = "Plugin.FlashMIMEType";
+
enum {
MIME_TYPE_OK = 0,
MIME_TYPE_EMPTY,
diff --git a/webkit/plugins/ppapi/ppapi_plugin_instance.cc b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
index 23a1862..8863c5f 100644
--- a/webkit/plugins/ppapi/ppapi_plugin_instance.cc
+++ b/webkit/plugins/ppapi/ppapi_plugin_instance.cc
@@ -160,10 +160,10 @@ const ui::TextInputType kPluginDefaultTextInputType = ui::TEXT_INPUT_TYPE_TEXT;
mismatching_enums)
// <embed>/<object> attributes.
-static const char kWidth[] = "width";
-static const char kHeight[] = "height";
-static const char kBorder[] = "border"; // According to w3c, deprecated.
-static const char kStyle[] = "style";
+const char kWidth[] = "width";
+const char kHeight[] = "height";
+const char kBorder[] = "border"; // According to w3c, deprecated.
+const char kStyle[] = "style";
COMPILE_ASSERT_MATCHING_ENUM(TypePointer, PP_CURSORTYPE_POINTER);
COMPILE_ASSERT_MATCHING_ENUM(TypeCross, PP_CURSORTYPE_CROSS);
generated by cgit v1.1 at 2025-01-20 23:23:17 +0000