| Index: chrome/browser/infobars/content_confirm_infobar_delegate.h
|
| diff --git a/content/browser/compositor/resize_lock.h b/chrome/browser/infobars/content_confirm_infobar_delegate.h
|
| similarity index 26%
|
| copy from content/browser/compositor/resize_lock.h
|
| copy to chrome/browser/infobars/content_confirm_infobar_delegate.h
|
| index 07acff33cf1e7dd9d774ff21922cfd156cd374b3..ca0f47ec082e47667f761a4b05eb161d5fff35d6 100644
|
| --- a/content/browser/compositor/resize_lock.h
|
| +++ b/chrome/browser/infobars/content_confirm_infobar_delegate.h
|
| @@ -2,36 +2,31 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CONTENT_BROWSER_COMPOSITOR_RESIZE_LOCK_H_
|
| -#define CONTENT_BROWSER_COMPOSITOR_RESIZE_LOCK_H_
|
| +#ifndef CHROME_BROWSER_INFOBARS_CONTENT_CONFIRM_INFOBAR_DELEGATE_H_
|
| +#define CHROME_BROWSER_INFOBARS_CONTENT_CONFIRM_INFOBAR_DELEGATE_H_
|
|
|
| -#include "base/basictypes.h"
|
| -#include "content/common/content_export.h"
|
| -#include "ui/gfx/size.h"
|
| +#include "chrome/browser/infobars/confirm_infobar_delegate.h"
|
|
|
| namespace content {
|
| +class WebContents;
|
| +} // namespace content
|
|
|
| -class CONTENT_EXPORT ResizeLock {
|
| +class ContentConfirmInfoBarDelegate : public ConfirmInfoBarDelegate {
|
| public:
|
| - virtual ~ResizeLock();
|
| -
|
| - virtual bool GrabDeferredLock();
|
| - virtual void UnlockCompositor();
|
| + virtual ~ContentConfirmInfoBarDelegate();
|
|
|
| - const gfx::Size& expected_size() const { return new_size_; }
|
| + content::WebContents* web_contents() { return web_contents_; }
|
|
|
| protected:
|
| - ResizeLock(const gfx::Size new_size, bool defer_compositor_lock);
|
| -
|
| - virtual void LockCompositor();
|
| + explicit ContentConfirmInfoBarDelegate(content::WebContents* web_contents);
|
|
|
| private:
|
| - gfx::Size new_size_;
|
| - bool defer_compositor_lock_;
|
| + // InfoBarDelegate:
|
| + virtual void CleanUp() OVERRIDE;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(ResizeLock);
|
| -};
|
| + content::WebContents* web_contents_;
|
|
|
| -} // namespace content
|
| + DISALLOW_COPY_AND_ASSIGN(ContentConfirmInfoBarDelegate);
|
| +};
|
|
|
| -#endif // CONTENT_BROWSER_COMPOSITOR_RESIZE_LOCK_H_
|
| +#endif // CHROME_BROWSER_INFOBARS_CONTENT_CONFIRM_INFOBAR_DELEGATE_H_
|
|
|