| Index: chrome/browser/ui/views/frame/desktop_browser_frame_aura.h
|
| ===================================================================
|
| --- chrome/browser/ui/views/frame/desktop_browser_frame_aura.h (revision 156300)
|
| +++ chrome/browser/ui/views/frame/desktop_browser_frame_aura.h (working copy)
|
| @@ -2,14 +2,14 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_
|
| -#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_
|
| +#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
|
| +#define CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/ui/views/frame/native_browser_frame.h"
|
| #include "ui/views/context_menu_controller.h"
|
| -#include "ui/views/widget/native_widget_aura.h"
|
| +#include "ui/views/widget/desktop_native_widget_aura.h"
|
|
|
| class BrowserFrame;
|
| class BrowserView;
|
| @@ -19,16 +19,17 @@
|
| }
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// BrowserFrameAura
|
| +// DesktopBrowserFrameAura
|
| //
|
| -// BrowserFrameAura is a NativeWidgetAura subclass that provides the window
|
| -// frame for the Chrome browser window.
|
| +// DesktopBrowserFrameAura is a DesktopNativeWidgetAura subclass that provides
|
| +// the window frame for the Chrome browser window.
|
| //
|
| -class BrowserFrameAura : public views::ContextMenuController,
|
| - public views::NativeWidgetAura,
|
| - public NativeBrowserFrame {
|
| +class DesktopBrowserFrameAura : public views::ContextMenuController,
|
| + public views::DesktopNativeWidgetAura,
|
| + public NativeBrowserFrame {
|
| public:
|
| - BrowserFrameAura(BrowserFrame* browser_frame, BrowserView* browser_view);
|
| + DesktopBrowserFrameAura(BrowserFrame* browser_frame,
|
| + BrowserView* browser_view);
|
|
|
| BrowserView* browser_view() const { return browser_view_; }
|
|
|
| @@ -51,7 +52,7 @@
|
| private:
|
| class WindowPropertyWatcher;
|
|
|
| - virtual ~BrowserFrameAura();
|
| + virtual ~DesktopBrowserFrameAura();
|
|
|
| // The BrowserView is our ClientView. This is a pointer to it.
|
| BrowserView* browser_view_;
|
| @@ -61,7 +62,7 @@
|
| // System menu.
|
| scoped_ptr<views::MenuRunner> menu_runner_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(BrowserFrameAura);
|
| + DISALLOW_COPY_AND_ASSIGN(DesktopBrowserFrameAura);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_AURA_H_
|
| +#endif // CHROME_BROWSER_UI_VIEWS_FRAME_DESKTOP_BROWSER_FRAME_AURA_H_
|
|
|