| 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/extensions/api/tabs/app_window_controller.h" |
| 6 |
| 7 #include <utility> |
| 8 |
| 5 #include "base/values.h" | 9 #include "base/values.h" |
| 6 #include "chrome/browser/extensions/api/tabs/app_base_window.h" | 10 #include "chrome/browser/extensions/api/tabs/app_base_window.h" |
| 7 #include "chrome/browser/extensions/api/tabs/app_window_controller.h" | |
| 8 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 11 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
| 9 #include "chrome/browser/extensions/extension_tab_util.h" | 12 #include "chrome/browser/extensions/extension_tab_util.h" |
| 10 #include "chrome/browser/extensions/window_controller.h" | 13 #include "chrome/browser/extensions/window_controller.h" |
| 11 #include "chrome/browser/extensions/window_controller_list.h" | 14 #include "chrome/browser/extensions/window_controller_list.h" |
| 12 #include "chrome/browser/sessions/session_tab_helper.h" | 15 #include "chrome/browser/sessions/session_tab_helper.h" |
| 13 #include "chrome/common/url_constants.h" | 16 #include "chrome/common/url_constants.h" |
| 14 #include "extensions/browser/app_window/app_window.h" | 17 #include "extensions/browser/app_window/app_window.h" |
| 15 #include "extensions/browser/app_window/native_app_window.h" | 18 #include "extensions/browser/app_window/native_app_window.h" |
| 16 #include "extensions/common/extension.h" | 19 #include "extensions/common/extension.h" |
| 17 | 20 |
| 18 namespace extensions { | 21 namespace extensions { |
| 19 | 22 |
| 20 AppWindowController::AppWindowController(AppWindow* app_window, | 23 AppWindowController::AppWindowController(AppWindow* app_window, |
| 21 scoped_ptr<AppBaseWindow> base_window, | 24 scoped_ptr<AppBaseWindow> base_window, |
| 22 Profile* profile) | 25 Profile* profile) |
| 23 : WindowController(base_window.get(), profile), | 26 : WindowController(base_window.get(), profile), |
| 24 app_window_(app_window), | 27 app_window_(app_window), |
| 25 base_window_(base_window.Pass()) { | 28 base_window_(std::move(base_window)) { |
| 26 WindowControllerList::GetInstance()->AddExtensionWindow(this); | 29 WindowControllerList::GetInstance()->AddExtensionWindow(this); |
| 27 } | 30 } |
| 28 | 31 |
| 29 AppWindowController::~AppWindowController() { | 32 AppWindowController::~AppWindowController() { |
| 30 WindowControllerList::GetInstance()->RemoveExtensionWindow(this); | 33 WindowControllerList::GetInstance()->RemoveExtensionWindow(this); |
| 31 } | 34 } |
| 32 | 35 |
| 33 int AppWindowController::GetWindowId() const { | 36 int AppWindowController::GetWindowId() const { |
| 34 return static_cast<int>(app_window_->session_id().id()); | 37 return static_cast<int>(app_window_->session_id().id()); |
| 35 } | 38 } |
| (...skipping 82 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 118 return nullptr; | 121 return nullptr; |
| 119 } | 122 } |
| 120 | 123 |
| 121 bool AppWindowController::IsVisibleToExtension( | 124 bool AppWindowController::IsVisibleToExtension( |
| 122 const Extension* extension) const { | 125 const Extension* extension) const { |
| 123 DCHECK(extension); | 126 DCHECK(extension); |
| 124 return extension->id() == app_window_->extension_id(); | 127 return extension->id() == app_window_->extension_id(); |
| 125 } | 128 } |
| 126 | 129 |
| 127 } // namespace extensions | 130 } // namespace extensions |
| OLD | NEW |