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 |
(...skipping 10 matching lines...) Expand all Loading... |
21 #include "chrome/browser/ui/browser.h" | 21 #include "chrome/browser/ui/browser.h" |
22 #include "chrome/browser/ui/browser_commands.h" | 22 #include "chrome/browser/ui/browser_commands.h" |
23 #include "chrome/browser/ui/browser_finder.h" | 23 #include "chrome/browser/ui/browser_finder.h" |
24 #include "chrome/browser/ui/browser_list.h" | 24 #include "chrome/browser/ui/browser_list.h" |
25 #include "chrome/browser/ui/browser_window.h" | 25 #include "chrome/browser/ui/browser_window.h" |
26 #include "chrome/browser/ui/chrome_pages.h" | 26 #include "chrome/browser/ui/chrome_pages.h" |
27 #include "chrome/browser/ui/settings_window_manager.h" | 27 #include "chrome/browser/ui/settings_window_manager.h" |
28 #include "chrome/browser/ui/tabs/tab_strip_model.h" | 28 #include "chrome/browser/ui/tabs/tab_strip_model.h" |
29 #include "chrome/browser/web_applications/web_app.h" | 29 #include "chrome/browser/web_applications/web_app.h" |
30 #include "chrome/common/extensions/extension_constants.h" | 30 #include "chrome/common/extensions/extension_constants.h" |
31 #include "chrome/grit/chromium_strings.h" | |
32 #include "chrome/grit/generated_resources.h" | 31 #include "chrome/grit/generated_resources.h" |
33 #include "components/strings/grit/components_strings.h" | 32 #include "components/strings/grit/components_strings.h" |
34 #include "content/public/browser/web_contents.h" | 33 #include "content/public/browser/web_contents.h" |
35 #include "content/public/common/url_constants.h" | 34 #include "content/public/common/url_constants.h" |
36 #include "ui/aura/window.h" | 35 #include "ui/aura/window.h" |
37 #include "ui/base/l10n/l10n_util.h" | 36 #include "ui/base/l10n/l10n_util.h" |
38 #include "ui/base/resource/resource_bundle.h" | 37 #include "ui/base/resource/resource_bundle.h" |
39 #include "ui/events/event.h" | 38 #include "ui/events/event.h" |
40 #include "ui/events/event_constants.h" | 39 #include "ui/events/event_constants.h" |
41 #include "ui/gfx/image/image.h" | 40 #include "ui/gfx/image/image.h" |
(...skipping 351 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 |