6 files changed, 14 insertions, 11 deletions
diff --git a/chrome/app/breakpad_win.cc b/chrome/app/breakpad_win.cc
index f77fb3f..00a8816 100644
--- a/chrome/app/breakpad_win.cc
+++ b/chrome/app/breakpad_win.cc
@@ -20,6 +20,7 @@
 #include "base/win_util.h"
 #include "breakpad/src/client/windows/handler/exception_handler.h"
 #include "chrome/app/hard_error_handler_win.h"
+#include "chrome/common/child_process_logging.h"
 #include "chrome/common/env_vars.h"
 #include "chrome/common/result_codes.h"
 #include "chrome/installer/util/google_update_settings.h"
diff --git a/chrome/app/breakpad_win.h b/chrome/app/breakpad_win.h
index 3a13149..326609dc 100644
--- a/chrome/app/breakpad_win.h
+++ b/chrome/app/breakpad_win.h
@@ -11,9 +11,6 @@
 // The maximum number of 64-char URL chunks we will report.
 static const int kMaxUrlChunks = 8;
 
-// The maximum number of active extensions we will report.
-static const int kMaxReportedActiveExtensions = 10;
-
 // Calls InitCrashReporterThread in it's own thread for the browser process
 // or directly for the plugin and renderer process.
 void InitCrashReporterWithDllPath(const std::wstring& dll_path);
diff --git a/chrome/common/child_process_logging.h b/chrome/common/child_process_logging.h
index 9bc386e..edf4517 100644
--- a/chrome/common/child_process_logging.h
+++ b/chrome/common/child_process_logging.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -6,10 +6,18 @@
 #define CHROME_COMMON_CHILD_PROCESS_LOGGING_H_
 
 #include <set>
+#include <string>
 
 #include "base/basictypes.h"
 #include "googleurl/src/gurl.h"
 
+#if defined(OS_WIN)
+// The maximum number of active extensions we will report.
+// Also used in chrome/app, but we define it here to avoid a common->app
+// dependency.
+static const int kMaxReportedActiveExtensions = 10;
+#endif
+
 namespace child_process_logging {
 
 // Sets the URL that is logged if the child process crashes. Use GURL() to clear
diff --git a/chrome/common/child_process_logging_linux.cc b/chrome/common/child_process_logging_linux.cc
index a60788f..06e20c2 100644
--- a/chrome/common/child_process_logging_linux.cc
+++ b/chrome/common/child_process_logging_linux.cc
@@ -1,11 +1,9 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
 #include "chrome/common/child_process_logging.h"
 
-#include <string>
-
 #include "base/logging.h"
 #include "base/string_util.h"
 #include "chrome/installer/util/google_update_settings.h"
diff --git a/chrome/common/child_process_logging_win.cc b/chrome/common/child_process_logging_win.cc
index 0dc0579..3513a93 100644
--- a/chrome/common/child_process_logging_win.cc
+++ b/chrome/common/child_process_logging_win.cc
@@ -1,4 +1,4 @@
-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// Copyright (c) 2010 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.
 
@@ -8,7 +8,6 @@
 
 #include "base/string_util.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/app/breakpad_win.h"
 #include "chrome/common/chrome_constants.h"
 #include "chrome/installer/util/google_update_settings.h"
 #include "googleurl/src/gurl.h"
diff --git a/chrome/common/extensions/extension_action.cc b/chrome/common/extensions/extension_action.cc
index 9951ba6..dbdae7f 100644
--- a/chrome/common/extensions/extension_action.cc
+++ b/chrome/common/extensions/extension_action.cc
@@ -8,7 +8,6 @@
 
 #include "app/resource_bundle.h"
 #include "base/utf_string_conversions.h"
-#include "chrome/app/chrome_dll_resource.h"
 #include "gfx/canvas_skia.h"
 #include "gfx/font.h"
 #include "gfx/rect.h"
@@ -158,7 +157,8 @@ void ExtensionAction::PaintBadge(gfx::Canvas* canvas,
   rect_paint.setStyle(SkPaint::kFill_Style);
   rect_paint.setAntiAlias(true);
   rect_paint.setColor(background_color);
-  canvas->AsCanvasSkia()->drawRoundRect(rect, SkIntToScalar(2), SkIntToScalar(2),
+  canvas->AsCanvasSkia()->drawRoundRect(rect, SkIntToScalar(2),
+                                        SkIntToScalar(2),
                                         rect_paint);
 
   // Overlay the gradient. It is stretchy, so we do this in three parts.