summaryrefslogtreecommitdiffstats
path: root/chrome/browser/ui/webui/conflicts_ui.h
diff options
context:
space:
mode:
Diffstat (limited to 'chrome/browser/ui/webui/conflicts_ui.h')
-rw-r--r--chrome/browser/ui/webui/conflicts_ui.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/chrome/browser/ui/webui/conflicts_ui.h b/chrome/browser/ui/webui/conflicts_ui.h
index 8a402ae..0b243ac 100644
--- a/chrome/browser/ui/webui/conflicts_ui.h
+++ b/chrome/browser/ui/webui/conflicts_ui.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 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.
@@ -10,14 +10,16 @@
#if defined(OS_WIN)
+namespace base {
class RefCountedMemory;
+}
// The Web UI handler for about:conflicts.
class ConflictsUI : public content::WebUIController {
public:
explicit ConflictsUI(content::WebUI* web_ui);
- static RefCountedMemory* GetFaviconResourceBytes();
+ static base::RefCountedMemory* GetFaviconResourceBytes();
private:
DISALLOW_COPY_AND_ASSIGN(ConflictsUI);