| Index: chrome/browser/ui/views/frame/browser_frame_android.h
|
| diff --git a/chrome/browser/ui/views/frame/browser_frame_ash.h b/chrome/browser/ui/views/frame/browser_frame_android.h
|
| similarity index 60%
|
| copy from chrome/browser/ui/views/frame/browser_frame_ash.h
|
| copy to chrome/browser/ui/views/frame/browser_frame_android.h
|
| index b14f73800197109f66007a895ff6adf81257bc88..f711d411c87b3bdde2e22a7a21d4c06ed3d56a27 100644
|
| --- a/chrome/browser/ui/views/frame/browser_frame_ash.h
|
| +++ b/chrome/browser/ui/views/frame/browser_frame_android.h
|
| @@ -1,37 +1,40 @@
|
| -// Copyright 2013 The Chromium Authors. All rights reserved.
|
| +// Copyright 2015 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_UI_VIEWS_FRAME_BROWSER_FRAME_ASH_H_
|
| -#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ASH_H_
|
| +#ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ANDROID_H_
|
| +#define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ANDROID_H_
|
|
|
| #include "base/basictypes.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "chrome/browser/ui/views/frame/native_browser_frame.h"
|
| +#include "ui/aura/window_tree_host_platform.h"
|
| #include "ui/views/widget/native_widget_aura.h"
|
|
|
| class BrowserFrame;
|
| class BrowserView;
|
|
|
| ////////////////////////////////////////////////////////////////////////////////
|
| -// BrowserFrameAsh
|
| +// BrowserFrameAndroid
|
| //
|
| -// BrowserFrameAsh is a NativeWidgetAura subclass that provides the window
|
| +// BrowserFrameAndroid is a NativeWidgetAura subclass that provides the window
|
| // frame for the Chrome browser window.
|
| //
|
| -class BrowserFrameAsh : public views::NativeWidgetAura,
|
| - public NativeBrowserFrame {
|
| +class BrowserFrameAndroid : public views::NativeWidgetAura,
|
| + public NativeBrowserFrame {
|
| public:
|
| static const char kWindowName[];
|
|
|
| - BrowserFrameAsh(BrowserFrame* browser_frame, BrowserView* browser_view);
|
| + BrowserFrameAndroid(BrowserFrame* browser_frame, BrowserView* browser_view);
|
|
|
| BrowserView* browser_view() const { return browser_view_; }
|
|
|
| + // Must be called before the browser frame is created.
|
| + static void SetHost(aura::WindowTreeHostPlatform* host);
|
| +
|
| protected:
|
| // Overridden from views::NativeWidgetAura:
|
| void OnWindowDestroying(aura::Window* window) override;
|
| - void OnWindowTargetVisibilityChanged(bool visible) override;
|
|
|
| // Overridden from NativeBrowserFrame:
|
| views::Widget::InitParams GetWidgetParams() override;
|
| @@ -42,18 +45,15 @@ class BrowserFrameAsh : public views::NativeWidgetAura,
|
| void GetWindowPlacement(gfx::Rect* bounds,
|
| ui::WindowShowState* show_state) const override;
|
|
|
| - ~BrowserFrameAsh() override;
|
| + ~BrowserFrameAndroid() override;
|
|
|
| private:
|
| class WindowPropertyWatcher;
|
|
|
| - // Set the window into the auto managed mode.
|
| - void SetWindowAutoManaged();
|
| -
|
| // The BrowserView is our ClientView. This is a pointer to it.
|
| BrowserView* browser_view_;
|
|
|
| - DISALLOW_COPY_AND_ASSIGN(BrowserFrameAsh);
|
| + DISALLOW_COPY_AND_ASSIGN(BrowserFrameAndroid);
|
| };
|
|
|
| -#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ASH_H_
|
| +#endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_FRAME_ANDROID_H_
|
|
|