OLD | NEW |
1 // Copyright 2013 The Chromium Authors. All rights reserved. | 1 // Copyright 2013 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/ash/chrome_new_window_client.h" | 5 #include "chrome/browser/ui/ash/chrome_new_window_client.h" |
6 | 6 |
7 #include "ash/content/keyboard_overlay/keyboard_overlay_view.h" | 7 #include "ash/content/keyboard_overlay/keyboard_overlay_view.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "chrome/browser/chromeos/file_manager/app_id.h" | 9 #include "chrome/browser/chromeos/file_manager/app_id.h" |
10 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" | 10 #include "chrome/browser/extensions/api/terminal/terminal_extension_helper.h" |
(...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
59 } | 59 } |
60 | 60 |
61 ChromeNewWindowClient::ChromeNewWindowClient() : binding_(this) { | 61 ChromeNewWindowClient::ChromeNewWindowClient() : binding_(this) { |
62 service_manager::Connector* connector = | 62 service_manager::Connector* connector = |
63 content::ServiceManagerConnection::GetForProcess()->GetConnector(); | 63 content::ServiceManagerConnection::GetForProcess()->GetConnector(); |
64 connector->BindInterface(ash_util::GetAshServiceName(), | 64 connector->BindInterface(ash_util::GetAshServiceName(), |
65 &new_window_controller_); | 65 &new_window_controller_); |
66 | 66 |
67 // Register this object as the client interface implementation. | 67 // Register this object as the client interface implementation. |
68 ash::mojom::NewWindowClientAssociatedPtrInfo ptr_info; | 68 ash::mojom::NewWindowClientAssociatedPtrInfo ptr_info; |
69 binding_.Bind(&ptr_info, new_window_controller_.associated_group()); | 69 binding_.Bind(&ptr_info); |
70 new_window_controller_->SetClient(std::move(ptr_info)); | 70 new_window_controller_->SetClient(std::move(ptr_info)); |
71 } | 71 } |
72 | 72 |
73 ChromeNewWindowClient::~ChromeNewWindowClient() {} | 73 ChromeNewWindowClient::~ChromeNewWindowClient() {} |
74 | 74 |
75 // TabRestoreHelper is used to restore a tab. In particular when the user | 75 // TabRestoreHelper is used to restore a tab. In particular when the user |
76 // attempts to a restore a tab if the TabRestoreService hasn't finished loading | 76 // attempts to a restore a tab if the TabRestoreService hasn't finished loading |
77 // this waits for it. Once the TabRestoreService finishes loading the tab is | 77 // this waits for it. Once the TabRestoreService finishes loading the tab is |
78 // restored. | 78 // restored. |
79 class ChromeNewWindowClient::TabRestoreHelper | 79 class ChromeNewWindowClient::TabRestoreHelper |
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
214 GURL(url)); | 214 GURL(url)); |
215 } | 215 } |
216 | 216 |
217 void ChromeNewWindowClient::ShowTaskManager() { | 217 void ChromeNewWindowClient::ShowTaskManager() { |
218 chrome::OpenTaskManager(nullptr); | 218 chrome::OpenTaskManager(nullptr); |
219 } | 219 } |
220 | 220 |
221 void ChromeNewWindowClient::OpenFeedbackPage() { | 221 void ChromeNewWindowClient::OpenFeedbackPage() { |
222 chrome::OpenFeedbackDialog(GetActiveBrowser()); | 222 chrome::OpenFeedbackDialog(GetActiveBrowser()); |
223 } | 223 } |
OLD | NEW |