OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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 "base/bind.h" | 5 #include "base/bind.h" |
6 #include "base/command_line.h" | 6 #include "base/command_line.h" |
7 #include "base/lazy_instance.h" | 7 #include "base/lazy_instance.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/string_number_conversions.h" | 10 #include "base/string_number_conversions.h" |
11 #include "base/time.h" | 11 #include "base/time.h" |
12 #include "chrome/browser/extensions/extension_event_router.h" | 12 #include "chrome/browser/extensions/extension_event_router.h" |
13 #include "chrome/browser/extensions/extension_process_manager.h" | 13 #include "chrome/browser/extensions/extension_process_manager.h" |
14 #include "chrome/browser/extensions/extension_host.h" | 14 #include "chrome/browser/extensions/extension_host.h" |
15 #include "chrome/browser/extensions/extension_info_map.h" | 15 #include "chrome/browser/extensions/extension_info_map.h" |
16 #include "chrome/browser/extensions/extension_service.h" | 16 #include "chrome/browser/extensions/extension_service.h" |
17 #include "chrome/browser/extensions/extension_system.h" | 17 #include "chrome/browser/extensions/extension_system.h" |
18 #include "chrome/browser/profiles/profile.h" | 18 #include "chrome/browser/profiles/profile.h" |
19 #include "chrome/browser/ui/browser.h" | 19 #include "chrome/browser/ui/browser.h" |
20 #include "chrome/browser/ui/browser_finder.h" | 20 #include "chrome/browser/ui/browser_finder.h" |
| 21 #include "chrome/browser/ui/browser_tabstrip.h" |
21 #include "chrome/browser/ui/browser_window.h" | 22 #include "chrome/browser/ui/browser_window.h" |
22 #include "chrome/browser/view_type_utils.h" | 23 #include "chrome/browser/view_type_utils.h" |
23 #include "chrome/common/chrome_notification_types.h" | 24 #include "chrome/common/chrome_notification_types.h" |
24 #include "chrome/common/chrome_switches.h" | 25 #include "chrome/common/chrome_switches.h" |
25 #include "chrome/common/extensions/extension.h" | 26 #include "chrome/common/extensions/extension.h" |
26 #include "chrome/common/extensions/extension_messages.h" | 27 #include "chrome/common/extensions/extension_messages.h" |
27 #include "chrome/common/url_constants.h" | 28 #include "chrome/common/url_constants.h" |
28 #include "content/public/browser/browser_thread.h" | 29 #include "content/public/browser/browser_thread.h" |
29 #include "content/public/browser/notification_service.h" | 30 #include "content/public/browser/notification_service.h" |
30 #include "content/public/browser/render_process_host.h" | 31 #include "content/public/browser/render_process_host.h" |
(...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
290 // able to save settings from OTR. | 291 // able to save settings from OTR. |
291 if (!browser || browser->profile()->IsOffTheRecord()) { | 292 if (!browser || browser->profile()->IsOffTheRecord()) { |
292 Profile* profile = GetProfile(); | 293 Profile* profile = GetProfile(); |
293 browser = browser::FindOrCreateTabbedBrowser(profile->GetOriginalProfile()); | 294 browser = browser::FindOrCreateTabbedBrowser(profile->GetOriginalProfile()); |
294 } | 295 } |
295 | 296 |
296 OpenURLParams params(extension->options_url(), Referrer(), SINGLETON_TAB, | 297 OpenURLParams params(extension->options_url(), Referrer(), SINGLETON_TAB, |
297 content::PAGE_TRANSITION_LINK, false); | 298 content::PAGE_TRANSITION_LINK, false); |
298 browser->OpenURL(params); | 299 browser->OpenURL(params); |
299 browser->window()->Show(); | 300 browser->window()->Show(); |
300 WebContents* web_contents = browser->GetActiveWebContents(); | 301 WebContents* web_contents = chrome::GetActiveWebContents(browser); |
301 web_contents->GetDelegate()->ActivateContents(web_contents); | 302 web_contents->GetDelegate()->ActivateContents(web_contents); |
302 } | 303 } |
303 | 304 |
304 ExtensionHost* ExtensionProcessManager::GetBackgroundHostForExtension( | 305 ExtensionHost* ExtensionProcessManager::GetBackgroundHostForExtension( |
305 const std::string& extension_id) { | 306 const std::string& extension_id) { |
306 for (ExtensionHostSet::iterator iter = background_hosts_.begin(); | 307 for (ExtensionHostSet::iterator iter = background_hosts_.begin(); |
307 iter != background_hosts_.end(); ++iter) { | 308 iter != background_hosts_.end(); ++iter) { |
308 ExtensionHost* host = *iter; | 309 ExtensionHost* host = *iter; |
309 if (host->extension_id() == extension_id) | 310 if (host->extension_id() == extension_id) |
310 return host; | 311 return host; |
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
778 if (service && service->is_ready()) | 779 if (service && service->is_ready()) |
779 CreateBackgroundHostsForProfileStartup(this, service->extensions()); | 780 CreateBackgroundHostsForProfileStartup(this, service->extensions()); |
780 } | 781 } |
781 break; | 782 break; |
782 } | 783 } |
783 default: | 784 default: |
784 ExtensionProcessManager::Observe(type, source, details); | 785 ExtensionProcessManager::Observe(type, source, details); |
785 break; | 786 break; |
786 } | 787 } |
787 } | 788 } |
OLD | NEW |