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 <memory> |
8 #include <utility> | 8 #include <utility> |
9 | 9 |
| 10 #include "base/memory/ptr_util.h" |
10 #include "base/strings/utf_string_conversions.h" | 11 #include "base/strings/utf_string_conversions.h" |
11 #include "base/values.h" | 12 #include "base/values.h" |
12 #include "chrome/browser/extensions/api/tabs/app_base_window.h" | 13 #include "chrome/browser/extensions/api/tabs/app_base_window.h" |
13 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" | 14 #include "chrome/browser/extensions/api/tabs/tabs_constants.h" |
14 #include "chrome/browser/extensions/extension_tab_util.h" | 15 #include "chrome/browser/extensions/extension_tab_util.h" |
15 #include "chrome/browser/extensions/window_controller.h" | 16 #include "chrome/browser/extensions/window_controller.h" |
16 #include "chrome/browser/extensions/window_controller_list.h" | 17 #include "chrome/browser/extensions/window_controller_list.h" |
17 #include "chrome/browser/sessions/session_tab_helper.h" | 18 #include "chrome/browser/sessions/session_tab_helper.h" |
18 #include "chrome/common/url_constants.h" | 19 #include "chrome/common/url_constants.h" |
19 #include "extensions/browser/app_window/app_window.h" | 20 #include "extensions/browser/app_window/app_window.h" |
(...skipping 29 matching lines...) Expand all Loading... |
49 std::unique_ptr<base::DictionaryValue> | 50 std::unique_ptr<base::DictionaryValue> |
50 AppWindowController::CreateWindowValueWithTabs( | 51 AppWindowController::CreateWindowValueWithTabs( |
51 const Extension* extension) const { | 52 const Extension* extension) const { |
52 std::unique_ptr<base::DictionaryValue> result = CreateWindowValue(); | 53 std::unique_ptr<base::DictionaryValue> result = CreateWindowValue(); |
53 | 54 |
54 std::unique_ptr<base::DictionaryValue> tab_value = | 55 std::unique_ptr<base::DictionaryValue> tab_value = |
55 CreateTabObject(extension, 0)->ToValue(); | 56 CreateTabObject(extension, 0)->ToValue(); |
56 if (!tab_value) | 57 if (!tab_value) |
57 return result; | 58 return result; |
58 | 59 |
59 base::ListValue* tab_list = new base::ListValue(); | 60 auto tab_list = base::MakeUnique<base::ListValue>(); |
60 tab_list->Append(std::move(tab_value)); | 61 tab_list->Append(std::move(tab_value)); |
61 result->Set(tabs_constants::kTabsKey, tab_list); | 62 result->Set(tabs_constants::kTabsKey, std::move(tab_list)); |
62 | 63 |
63 return result; | 64 return result; |
64 } | 65 } |
65 | 66 |
66 std::unique_ptr<api::tabs::Tab> AppWindowController::CreateTabObject( | 67 std::unique_ptr<api::tabs::Tab> AppWindowController::CreateTabObject( |
67 const extensions::Extension* extension, | 68 const extensions::Extension* extension, |
68 int tab_index) const { | 69 int tab_index) const { |
69 if (tab_index > 0) | 70 if (tab_index > 0) |
70 return nullptr; | 71 return nullptr; |
71 | 72 |
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
121 return nullptr; | 122 return nullptr; |
122 } | 123 } |
123 | 124 |
124 bool AppWindowController::IsVisibleToExtension( | 125 bool AppWindowController::IsVisibleToExtension( |
125 const Extension* extension) const { | 126 const Extension* extension) const { |
126 DCHECK(extension); | 127 DCHECK(extension); |
127 return extension->id() == app_window_->extension_id(); | 128 return extension->id() == app_window_->extension_id(); |
128 } | 129 } |
129 | 130 |
130 } // namespace extensions | 131 } // namespace extensions |
OLD | NEW |