OLD | NEW |
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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/launcher/browser_shortcut_launcher_item_controll
er.h" | 5 #include "chrome/browser/ui/ash/launcher/browser_shortcut_launcher_item_controll
er.h" |
6 | 6 |
7 #include <limits> | 7 #include <limits> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "ash/common/shelf/shelf_delegate.h" | |
11 #include "ash/common/shelf/shelf_model.h" | |
12 #include "ash/common/wm_shell.h" | |
13 #include "ash/common/wm_window.h" | |
14 #include "ash/public/cpp/shelf_application_menu_item.h" | 10 #include "ash/public/cpp/shelf_application_menu_item.h" |
15 #include "ash/resources/grit/ash_resources.h" | 11 #include "ash/resources/grit/ash_resources.h" |
| 12 #include "ash/shelf/shelf_delegate.h" |
| 13 #include "ash/shelf/shelf_model.h" |
16 #include "ash/wm/window_properties.h" | 14 #include "ash/wm/window_properties.h" |
17 #include "ash/wm/window_util.h" | 15 #include "ash/wm/window_util.h" |
| 16 #include "ash/wm_shell.h" |
| 17 #include "ash/wm_window.h" |
18 #include "base/memory/ptr_util.h" | 18 #include "base/memory/ptr_util.h" |
19 #include "chrome/browser/chrome_notification_types.h" | 19 #include "chrome/browser/chrome_notification_types.h" |
20 #include "chrome/browser/profiles/profile.h" | 20 #include "chrome/browser/profiles/profile.h" |
21 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 21 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
22 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" | 22 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" |
23 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" | 23 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" |
24 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 24 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
25 #include "chrome/browser/ui/browser.h" | 25 #include "chrome/browser/ui/browser.h" |
26 #include "chrome/browser/ui/browser_commands.h" | 26 #include "chrome/browser/ui/browser_commands.h" |
27 #include "chrome/browser/ui/browser_finder.h" | 27 #include "chrome/browser/ui/browser_finder.h" |
(...skipping 364 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
392 Browser* browser = content::Source<Browser>(source).ptr(); | 392 Browser* browser = content::Source<Browser>(source).ptr(); |
393 DCHECK(browser); | 393 DCHECK(browser); |
394 BrowserList::BrowserVector::iterator item = std::find( | 394 BrowserList::BrowserVector::iterator item = std::find( |
395 browser_menu_items_.begin(), browser_menu_items_.end(), browser); | 395 browser_menu_items_.begin(), browser_menu_items_.end(), browser); |
396 DCHECK(item != browser_menu_items_.end()); | 396 DCHECK(item != browser_menu_items_.end()); |
397 // Clear the entry for the closed browser and leave other indices intact. | 397 // Clear the entry for the closed browser and leave other indices intact. |
398 *item = nullptr; | 398 *item = nullptr; |
399 registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_CLOSING, | 399 registrar_.Remove(this, chrome::NOTIFICATION_BROWSER_CLOSING, |
400 content::Source<Browser>(browser)); | 400 content::Source<Browser>(browser)); |
401 } | 401 } |
OLD | NEW |