diff options
| author | Kristian Monsen <kristianm@google.com> | 2011-06-09 11:47:42 +0100 |
|---|---|---|
| committer | Kristian Monsen <kristianm@google.com> | 2011-06-29 14:33:03 +0100 |
| commit | dc0f95d653279beabeb9817299e2902918ba123e (patch) | |
| tree | 32eb121cd532053a5b9cb0c390331349af8d6baa /chrome/browser/dom_ui/conflicts_ui.h | |
| parent | ba160cd4054d13d0cb0b1b46e61c3bed67095811 (diff) | |
| download | external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.zip external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.gz external_chromium-dc0f95d653279beabeb9817299e2902918ba123e.tar.bz2 | |
Merge Chromium at r11.0.696.0: Initial merge by git
Change-Id: I273dde2843af0839dfc08b419bb443fbd449532d
Diffstat (limited to 'chrome/browser/dom_ui/conflicts_ui.h')
| -rw-r--r-- | chrome/browser/dom_ui/conflicts_ui.h | 28 |
1 files changed, 0 insertions, 28 deletions
diff --git a/chrome/browser/dom_ui/conflicts_ui.h b/chrome/browser/dom_ui/conflicts_ui.h deleted file mode 100644 index 48ea0fd..0000000 --- a/chrome/browser/dom_ui/conflicts_ui.h +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) 2011 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/web_ui.h" - -#if defined(OS_WIN) - -class RefCountedMemory; - -// The Web UI handler for about:conflicts. -class ConflictsUI : public WebUI { - public: - explicit ConflictsUI(TabContents* contents); - - static RefCountedMemory* GetFaviconResourceBytes(); - - private: - DISALLOW_COPY_AND_ASSIGN(ConflictsUI); -}; - -#endif - -#endif // CHROME_BROWSER_DOM_UI_CONFLICTS_UI_H_ |