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 <utility> | 8 #include <utility> |
9 #include <vector> | 9 #include <vector> |
10 | 10 |
11 #include "ash/public/cpp/window_properties.h" | 11 #include "ash/public/cpp/window_properties.h" |
12 #include "ash/resources/grit/ash_resources.h" | 12 #include "ash/resources/grit/ash_resources.h" |
13 #include "ash/shelf/shelf_model.h" | 13 #include "ash/shelf/shelf_model.h" |
14 #include "ash/wm_window.h" | |
15 #include "base/memory/ptr_util.h" | 14 #include "base/memory/ptr_util.h" |
16 #include "chrome/browser/profiles/profile.h" | 15 #include "chrome/browser/profiles/profile.h" |
17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" | 16 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller.h" |
18 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" | 17 #include "chrome/browser/ui/ash/launcher/chrome_launcher_controller_util.h" |
19 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" | 18 #include "chrome/browser/ui/ash/launcher/launcher_context_menu.h" |
20 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" | 19 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h" |
21 #include "chrome/browser/ui/browser.h" | 20 #include "chrome/browser/ui/browser.h" |
22 #include "chrome/browser/ui/browser_commands.h" | 21 #include "chrome/browser/ui/browser_commands.h" |
23 #include "chrome/browser/ui/browser_finder.h" | 22 #include "chrome/browser/ui/browser_finder.h" |
24 #include "chrome/browser/ui/browser_list.h" | 23 #include "chrome/browser/ui/browser_list.h" |
(...skipping 368 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
393 } | 392 } |
394 | 393 |
395 void BrowserShortcutLauncherItemController::OnBrowserClosing(Browser* browser) { | 394 void BrowserShortcutLauncherItemController::OnBrowserClosing(Browser* browser) { |
396 DCHECK(browser); | 395 DCHECK(browser); |
397 BrowserList::BrowserVector::iterator item = std::find( | 396 BrowserList::BrowserVector::iterator item = std::find( |
398 browser_menu_items_.begin(), browser_menu_items_.end(), browser); | 397 browser_menu_items_.begin(), browser_menu_items_.end(), browser); |
399 // Clear the entry for the closed browser and leave other indices intact. | 398 // Clear the entry for the closed browser and leave other indices intact. |
400 if (item != browser_menu_items_.end()) | 399 if (item != browser_menu_items_.end()) |
401 *item = nullptr; | 400 *item = nullptr; |
402 } | 401 } |
OLD | NEW |