OLD | NEW |
1 // Copyright 2015 The Chromium Authors. All rights reserved. | 1 // Copyright 2015 The Chromium Authors. All rights reserved. |
2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
4 | 4 |
5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_ |
6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_ |
7 | 7 |
| 8 #include <memory> |
| 9 |
8 #include "base/gtest_prod_util.h" | 10 #include "base/gtest_prod_util.h" |
9 #include "base/macros.h" | 11 #include "base/macros.h" |
10 #include "base/memory/scoped_ptr.h" | |
11 #include "build/build_config.h" | 12 #include "build/build_config.h" |
12 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" | 13 #include "chrome/browser/ui/views/apps/chrome_native_app_window_views.h" |
13 | 14 |
14 namespace apps { | 15 namespace apps { |
15 class AppWindowFrameView; | 16 class AppWindowFrameView; |
16 } | 17 } |
17 | 18 |
18 // Aura-specific parts of ChromeNativeAppWindowViews. This is used directly on | 19 // Aura-specific parts of ChromeNativeAppWindowViews. This is used directly on |
19 // Linux and Windows, and is the base class for the Ash specific class used on | 20 // Linux and Windows, and is the base class for the Ash specific class used on |
20 // ChromeOS. | 21 // ChromeOS. |
(...skipping 11 matching lines...) Expand all Loading... |
32 const extensions::AppWindow::CreateParams& create_params, | 33 const extensions::AppWindow::CreateParams& create_params, |
33 views::Widget::InitParams* init_params, | 34 views::Widget::InitParams* init_params, |
34 views::Widget* widget) override; | 35 views::Widget* widget) override; |
35 views::NonClientFrameView* CreateNonStandardAppFrame() override; | 36 views::NonClientFrameView* CreateNonStandardAppFrame() override; |
36 | 37 |
37 // ui::BaseWindow implementation. | 38 // ui::BaseWindow implementation. |
38 ui::WindowShowState GetRestoredState() const override; | 39 ui::WindowShowState GetRestoredState() const override; |
39 bool IsAlwaysOnTop() const override; | 40 bool IsAlwaysOnTop() const override; |
40 | 41 |
41 // NativeAppWindow implementation. | 42 // NativeAppWindow implementation. |
42 void UpdateShape(scoped_ptr<SkRegion> region) override; | 43 void UpdateShape(std::unique_ptr<SkRegion> region) override; |
43 | 44 |
44 private: | 45 private: |
45 FRIEND_TEST_ALL_PREFIXES(ShapedAppWindowTargeterTest, | 46 FRIEND_TEST_ALL_PREFIXES(ShapedAppWindowTargeterTest, |
46 ResizeInsetsWithinBounds); | 47 ResizeInsetsWithinBounds); |
47 | 48 |
48 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsAura); | 49 DISALLOW_COPY_AND_ASSIGN(ChromeNativeAppWindowViewsAura); |
49 }; | 50 }; |
50 | 51 |
51 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_ | 52 #endif // CHROME_BROWSER_UI_VIEWS_APPS_CHROME_NATIVE_APP_WINDOW_VIEWS_AURA_H_ |
OLD | NEW |