OLD | NEW |
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2010 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/status_icons/status_tray_manager.h" | 5 #include "chrome/browser/status_icons/status_tray_manager.h" |
6 | 6 |
7 #include "app/l10n_util.h" | 7 #include "app/l10n_util.h" |
8 #include "app/resource_bundle.h" | 8 #include "app/resource_bundle.h" |
9 #include "base/logging.h" | 9 #include "base/logging.h" |
10 #include "base/string_util.h" | 10 #include "base/string_util.h" |
| 11 #include "base/utf_string_conversions.h" |
11 #include "chrome/browser/browser.h" | 12 #include "chrome/browser/browser.h" |
12 #include "chrome/browser/browser_list.h" | 13 #include "chrome/browser/browser_list.h" |
13 #include "chrome/browser/browser_window.h" | 14 #include "chrome/browser/browser_window.h" |
14 #include "chrome/browser/status_icons/status_tray.h" | 15 #include "chrome/browser/status_icons/status_tray.h" |
15 #include "grit/browser_resources.h" | 16 #include "grit/browser_resources.h" |
16 #include "grit/chromium_strings.h" | 17 #include "grit/chromium_strings.h" |
17 #include "grit/theme_resources.h" | 18 #include "grit/theme_resources.h" |
18 | 19 |
19 StatusTrayManager::StatusTrayManager() : profile_(NULL) { | 20 StatusTrayManager::StatusTrayManager() : profile_(NULL) { |
20 } | 21 } |
(...skipping 26 matching lines...) Expand all Loading... |
47 Browser* browser = BrowserList::GetLastActiveWithProfile(profile_); | 48 Browser* browser = BrowserList::GetLastActiveWithProfile(profile_); |
48 if (browser) { | 49 if (browser) { |
49 // Bring up the existing browser window and show the extensions tab. | 50 // Bring up the existing browser window and show the extensions tab. |
50 browser->window()->Activate(); | 51 browser->window()->Activate(); |
51 browser->ShowExtensionsTab(); | 52 browser->ShowExtensionsTab(); |
52 } else { | 53 } else { |
53 // No windows are currently open, so open a new one. | 54 // No windows are currently open, so open a new one. |
54 Browser::OpenExtensionsWindow(profile_); | 55 Browser::OpenExtensionsWindow(profile_); |
55 } | 56 } |
56 } | 57 } |
OLD | NEW |