OLD | NEW |
1 // Copyright 2014 The Chromium Authors. All rights reserved. | 1 // Copyright 2014 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 "extensions/shell/browser/shell_desktop_controller_mac.h" | 5 #include "extensions/shell/browser/shell_desktop_controller_mac.h" |
6 | 6 |
7 #include "extensions/browser/app_window/native_app_window.h" | 7 #include "extensions/browser/app_window/native_app_window.h" |
8 #include "extensions/shell/browser/shell_app_delegate.h" | 8 #include "extensions/shell/browser/shell_app_delegate.h" |
9 #include "extensions/shell/browser/shell_app_window_client.h" | 9 #include "extensions/shell/browser/shell_app_window_client.h" |
10 #include "ui/gfx/display.h" | 10 #include "ui/gfx/display.h" |
11 #include "ui/gfx/geometry/size.h" | 11 #include "ui/gfx/geometry/size.h" |
12 #include "ui/gfx/screen.h" | 12 #include "ui/gfx/screen.h" |
13 | 13 |
14 namespace extensions { | 14 namespace extensions { |
15 | 15 |
16 ShellDesktopControllerMac::ShellDesktopControllerMac() | 16 ShellDesktopControllerMac::ShellDesktopControllerMac() |
17 : app_window_client_(new ShellAppWindowClient), app_window_(NULL) { | 17 : app_window_client_(new ShellAppWindowClient), app_window_(NULL) { |
18 AppWindowClient::Set(app_window_client_.get()); | 18 AppWindowClient::Set(app_window_client_.get()); |
19 } | 19 } |
20 | 20 |
21 ShellDesktopControllerMac::~ShellDesktopControllerMac() { | 21 ShellDesktopControllerMac::~ShellDesktopControllerMac() { |
22 // TOOD(yoz): This is actually too late to close app windows (for tests). | 22 // TOOD(yoz): This is actually too late to close app windows (for tests). |
23 // Maybe this is useful for non-tests. | 23 // Maybe this is useful for non-tests. |
24 CloseAppWindows(); | 24 CloseAppWindows(); |
25 } | 25 } |
26 | 26 |
27 gfx::Size ShellDesktopControllerMac::GetWindowSize() { | 27 gfx::Size ShellDesktopControllerMac::GetWindowSize() { |
28 // This is the full screen size. | 28 // This is the full screen size. |
29 return gfx::Screen::GetNativeScreen()->GetPrimaryDisplay().bounds().size(); | 29 return gfx::Screen::GetScreen()->GetPrimaryDisplay().bounds().size(); |
30 } | 30 } |
31 | 31 |
32 AppWindow* ShellDesktopControllerMac::CreateAppWindow( | 32 AppWindow* ShellDesktopControllerMac::CreateAppWindow( |
33 content::BrowserContext* context, | 33 content::BrowserContext* context, |
34 const Extension* extension) { | 34 const Extension* extension) { |
35 app_window_ = new AppWindow(context, new ShellAppDelegate, extension); | 35 app_window_ = new AppWindow(context, new ShellAppDelegate, extension); |
36 return app_window_; | 36 return app_window_; |
37 } | 37 } |
38 | 38 |
39 void ShellDesktopControllerMac::AddAppWindow(gfx::NativeWindow window) { | 39 void ShellDesktopControllerMac::AddAppWindow(gfx::NativeWindow window) { |
40 } | 40 } |
41 | 41 |
42 void ShellDesktopControllerMac::RemoveAppWindow(AppWindow* window) { | 42 void ShellDesktopControllerMac::RemoveAppWindow(AppWindow* window) { |
43 } | 43 } |
44 | 44 |
45 void ShellDesktopControllerMac::CloseAppWindows() { | 45 void ShellDesktopControllerMac::CloseAppWindows() { |
46 if (app_window_) { | 46 if (app_window_) { |
47 ui::BaseWindow* window = app_window_->GetBaseWindow(); | 47 ui::BaseWindow* window = app_window_->GetBaseWindow(); |
48 window->Close(); // Close() deletes |app_window_|. | 48 window->Close(); // Close() deletes |app_window_|. |
49 app_window_ = NULL; | 49 app_window_ = NULL; |
50 } | 50 } |
51 } | 51 } |
52 | 52 |
53 } // namespace extensions | 53 } // namespace extensions |
OLD | NEW |