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/ui/browser_navigator.h" | 5 #include "chrome/browser/ui/browser_navigator.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "chrome/browser/browser.h" | |
9 #include "chrome/browser/browser_list.h" | 8 #include "chrome/browser/browser_list.h" |
10 #include "chrome/browser/browser_url_handler.h" | 9 #include "chrome/browser/browser_url_handler.h" |
11 #include "chrome/browser/browser_window.h" | 10 #include "chrome/browser/browser_window.h" |
12 #include "chrome/browser/location_bar.h" | 11 #include "chrome/browser/location_bar.h" |
13 #include "chrome/browser/profile.h" | 12 #include "chrome/browser/profile.h" |
14 #include "chrome/browser/renderer_host/site_instance.h" | 13 #include "chrome/browser/renderer_host/site_instance.h" |
15 #include "chrome/browser/status_bubble.h" | 14 #include "chrome/browser/status_bubble.h" |
16 #include "chrome/browser/tabs/tab_strip_model.h" | 15 #include "chrome/browser/tabs/tab_strip_model.h" |
17 #include "chrome/browser/tab_contents/tab_contents.h" | 16 #include "chrome/browser/tab_contents/tab_contents.h" |
| 17 #include "chrome/browser/ui/browser.h" |
18 #include "chrome/common/chrome_switches.h" | 18 #include "chrome/common/chrome_switches.h" |
19 #include "chrome/common/url_constants.h" | 19 #include "chrome/common/url_constants.h" |
20 | 20 |
21 namespace { | 21 namespace { |
22 | 22 |
23 // Returns the SiteInstance for |source_contents| if it represents the same | 23 // Returns the SiteInstance for |source_contents| if it represents the same |
24 // website as |url|, or NULL otherwise. |source_contents| cannot be NULL. | 24 // website as |url|, or NULL otherwise. |source_contents| cannot be NULL. |
25 SiteInstance* GetSiteInstance(TabContents* source_contents, const GURL& url) { | 25 SiteInstance* GetSiteInstance(TabContents* source_contents, const GURL& url) { |
26 if (!source_contents) | 26 if (!source_contents) |
27 return NULL; | 27 return NULL; |
(...skipping 370 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
398 params->transition, | 398 params->transition, |
399 params->tabstrip_add_types); | 399 params->tabstrip_add_types); |
400 // Now that the |params->target_contents| is safely owned by the target | 400 // Now that the |params->target_contents| is safely owned by the target |
401 // Browser's TabStripModel, we can release ownership. | 401 // Browser's TabStripModel, we can release ownership. |
402 target_contents_owner.ReleaseOwnership(); | 402 target_contents_owner.ReleaseOwnership(); |
403 } | 403 } |
404 } | 404 } |
405 } | 405 } |
406 | 406 |
407 } // namespace browser | 407 } // namespace browser |
OLD | NEW |