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" | 5 #include "chrome/browser/extensions/api/tabs/app_window_controller.h" |
6 | 6 |
| 7 #include <memory> |
7 #include <utility> | 8 #include <utility> |
8 | 9 |
9 #include "base/strings/utf_string_conversions.h" | 10 #include "base/strings/utf_string_conversions.h" |
10 #include "base/values.h" | 11 #include "base/values.h" |
11 #include "chrome/browser/extensions/api/tabs/app_base_window.h" | 12 #include "chrome/browser/extensions/api/tabs/app_base_window.h" |
12 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 13 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
13 #include "chrome/browser/extensions/extension_tab_util.h" | 14 #include "chrome/browser/extensions/extension_tab_util.h" |
14 #include "chrome/browser/extensions/window_controller.h" | 15 #include "chrome/browser/extensions/window_controller.h" |
15 #include "chrome/browser/extensions/window_controller_list.h" | 16 #include "chrome/browser/extensions/window_controller_list.h" |
16 #include "chrome/browser/sessions/session_tab_helper.h" | 17 #include "chrome/browser/sessions/session_tab_helper.h" |
(...skipping 21 matching lines...) Expand all Loading... |
38 int AppWindowController::GetWindowId() const { | 39 int AppWindowController::GetWindowId() const { |
39 return static_cast<int>(app_window_->session_id().id()); | 40 return static_cast<int>(app_window_->session_id().id()); |
40 } | 41 } |
41 | 42 |
42 std::string AppWindowController::GetWindowTypeText() const { | 43 std::string AppWindowController::GetWindowTypeText() const { |
43 if (app_window_->window_type_is_panel()) | 44 if (app_window_->window_type_is_panel()) |
44 return tabs_constants::kWindowTypeValuePanel; | 45 return tabs_constants::kWindowTypeValuePanel; |
45 return tabs_constants::kWindowTypeValueApp; | 46 return tabs_constants::kWindowTypeValueApp; |
46 } | 47 } |
47 | 48 |
48 base::DictionaryValue* AppWindowController::CreateWindowValueWithTabs( | 49 std::unique_ptr<base::DictionaryValue> |
| 50 AppWindowController::CreateWindowValueWithTabs( |
49 const Extension* extension) const { | 51 const Extension* extension) const { |
50 base::DictionaryValue* result = CreateWindowValue(); | 52 std::unique_ptr<base::DictionaryValue> result = CreateWindowValue(); |
51 | 53 |
52 base::DictionaryValue* tab_value = CreateTabValue(extension, 0); | 54 base::DictionaryValue* tab_value = CreateTabValue(extension, 0); |
53 if (!tab_value) | 55 if (!tab_value) |
54 return result; | 56 return result; |
55 | 57 |
56 base::ListValue* tab_list = new base::ListValue(); | 58 base::ListValue* tab_list = new base::ListValue(); |
57 tab_list->Append(tab_value); | 59 tab_list->Append(tab_value); |
58 result->Set(tabs_constants::kTabsKey, tab_list); | 60 result->Set(tabs_constants::kTabsKey, tab_list); |
59 | 61 |
60 return result; | 62 return result; |
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
124 return nullptr; | 126 return nullptr; |
125 } | 127 } |
126 | 128 |
127 bool AppWindowController::IsVisibleToExtension( | 129 bool AppWindowController::IsVisibleToExtension( |
128 const Extension* extension) const { | 130 const Extension* extension) const { |
129 DCHECK(extension); | 131 DCHECK(extension); |
130 return extension->id() == app_window_->extension_id(); | 132 return extension->id() == app_window_->extension_id(); |
131 } | 133 } |
132 | 134 |
133 } // namespace extensions | 135 } // namespace extensions |
OLD | NEW |