diff options
| author | Ben Murdoch <benm@google.com> | 2010-11-18 18:32:45 +0000 |
|---|---|---|
| committer | Ben Murdoch <benm@google.com> | 2010-11-18 18:38:07 +0000 |
| commit | 513209b27ff55e2841eac0e4120199c23acce758 (patch) | |
| tree | aeba30bb08c5f47c57003544e378a377c297eee6 /chrome/browser/dom_ui/conflicts_ui.h | |
| parent | 164f7496de0fbee436b385a79ead9e3cb81a50c1 (diff) | |
| download | external_chromium-513209b27ff55e2841eac0e4120199c23acce758.zip external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.gz external_chromium-513209b27ff55e2841eac0e4120199c23acce758.tar.bz2 | |
Merge Chromium at r65505: Initial merge by git.
Change-Id: I31d8f1d8cd33caaf7f47ffa7350aef42d5fbdb45
Diffstat (limited to 'chrome/browser/dom_ui/conflicts_ui.h')
| -rw-r--r-- | chrome/browser/dom_ui/conflicts_ui.h | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/chrome/browser/dom_ui/conflicts_ui.h b/chrome/browser/dom_ui/conflicts_ui.h new file mode 100644 index 0000000..d683a9c --- /dev/null +++ b/chrome/browser/dom_ui/conflicts_ui.h @@ -0,0 +1,28 @@ +// 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. + +#ifndef CHROME_BROWSER_DOM_UI_CONFLICTS_UI_H_ +#define CHROME_BROWSER_DOM_UI_CONFLICTS_UI_H_ +#pragma once + +#include "chrome/browser/dom_ui/dom_ui.h" + +#if defined(OS_WIN) + +class RefCountedMemory; + +// The DOM UI handler for about:conflicts. +class ConflictsUI : public DOMUI { + public: + explicit ConflictsUI(TabContents* contents); + + static RefCountedMemory* GetFaviconResourceBytes(); + + private: + DISALLOW_COPY_AND_ASSIGN(ConflictsUI); +}; + +#endif + +#endif // CHROME_BROWSER_DOM_UI_CONFLICTS_UI_H_ |