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 #include "chrome/browser/ui/views/frame/browser_frame_mus.h" | 5 #include "chrome/browser/ui/views/frame/browser_frame_mus.h" |
6 | 6 |
7 #include <stdint.h> | 7 #include <stdint.h> |
8 | 8 |
9 #include "chrome/browser/ui/views/frame/browser_frame.h" | 9 #include "chrome/browser/ui/views/frame/browser_frame.h" |
10 #include "chrome/browser/ui/views/frame/browser_view.h" | 10 #include "chrome/browser/ui/views/frame/browser_view.h" |
(...skipping 11 matching lines...) Expand all Loading... |
22 params.bounds = gfx::Rect(10, 10, 640, 480); | 22 params.bounds = gfx::Rect(10, 10, 640, 480); |
23 params.delegate = browser_view; | 23 params.delegate = browser_view; |
24 return params; | 24 return params; |
25 } | 25 } |
26 | 26 |
27 ui::Window* CreateMusWindow(BrowserView* browser_view) { | 27 ui::Window* CreateMusWindow(BrowserView* browser_view) { |
28 std::map<std::string, std::vector<uint8_t>> properties; | 28 std::map<std::string, std::vector<uint8_t>> properties; |
29 views::NativeWidgetMus::ConfigurePropertiesForNewWindow( | 29 views::NativeWidgetMus::ConfigurePropertiesForNewWindow( |
30 GetWidgetParamsImpl(browser_view), &properties); | 30 GetWidgetParamsImpl(browser_view), &properties); |
31 const std::string chrome_app_id(extension_misc::kChromeAppId); | 31 const std::string chrome_app_id(extension_misc::kChromeAppId); |
| 32 // Indicates mash shouldn't handle immersive, rather we will. |
| 33 properties[ui::mojom::WindowManager::kDisableImmersive_Property] = |
| 34 mojo::ConvertTo<std::vector<uint8_t>>(true); |
32 properties[ui::mojom::WindowManager::kAppID_Property] = | 35 properties[ui::mojom::WindowManager::kAppID_Property] = |
33 mojo::ConvertTo<std::vector<uint8_t>>(chrome_app_id); | 36 mojo::ConvertTo<std::vector<uint8_t>>(chrome_app_id); |
34 return views::WindowManagerConnection::Get()->NewWindow(properties); | 37 return views::WindowManagerConnection::Get()->NewWindow(properties); |
35 } | 38 } |
36 | 39 |
37 } // namespace | 40 } // namespace |
38 | 41 |
39 BrowserFrameMus::BrowserFrameMus(BrowserFrame* browser_frame, | 42 BrowserFrameMus::BrowserFrameMus(BrowserFrame* browser_frame, |
40 BrowserView* browser_view) | 43 BrowserView* browser_view) |
41 : views::NativeWidgetMus(browser_frame, | 44 : views::NativeWidgetMus(browser_frame, |
(...skipping 28 matching lines...) Expand all Loading... |
70 } | 73 } |
71 | 74 |
72 int BrowserFrameMus::GetMinimizeButtonOffset() const { | 75 int BrowserFrameMus::GetMinimizeButtonOffset() const { |
73 return 0; | 76 return 0; |
74 } | 77 } |
75 | 78 |
76 void BrowserFrameMus::UpdateClientArea() { | 79 void BrowserFrameMus::UpdateClientArea() { |
77 // BrowserNonClientFrameViewMus::OnBoundsChanged() takes care of updating | 80 // BrowserNonClientFrameViewMus::OnBoundsChanged() takes care of updating |
78 // the insets. | 81 // the insets. |
79 } | 82 } |
OLD | NEW |