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 "chrome/browser/ui/webui/chrome_web_contents_handler.h" | 5 #include "chrome/browser/ui/webui/chrome_web_contents_handler.h" |
6 | 6 |
7 #include "chrome/browser/profiles/profile.h" | 7 #include "chrome/browser/profiles/profile.h" |
8 #include "chrome/browser/ui/browser.h" | 8 #include "chrome/browser/ui/browser.h" |
9 #include "chrome/browser/ui/browser_finder.h" | 9 #include "chrome/browser/ui/browser_finder.h" |
10 #include "chrome/browser/ui/browser_navigator.h" | 10 #include "chrome/browser/ui/browser_navigator.h" |
(...skipping 27 matching lines...) Expand all Loading... |
38 | 38 |
39 Profile* profile = Profile::FromBrowserContext(context); | 39 Profile* profile = Profile::FromBrowserContext(context); |
40 | 40 |
41 chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; | 41 chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; |
42 if (source) { | 42 if (source) { |
43 Browser* source_browser = chrome::FindBrowserWithWebContents(source); | 43 Browser* source_browser = chrome::FindBrowserWithWebContents(source); |
44 if (source_browser) | 44 if (source_browser) |
45 desktop_type = source_browser->host_desktop_type(); | 45 desktop_type = source_browser->host_desktop_type(); |
46 } | 46 } |
47 | 47 |
48 Browser* browser = chrome::FindTabbedBrowser(profile, false, desktop_type); | 48 Browser* browser = chrome::FindTabbedBrowser(profile, false); |
49 const bool browser_created = !browser; | 49 const bool browser_created = !browser; |
50 if (!browser) | 50 if (!browser) |
51 browser = new Browser( | 51 browser = new Browser( |
52 Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); | 52 Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); |
53 chrome::NavigateParams nav_params(browser, params.url, params.transition); | 53 chrome::NavigateParams nav_params(browser, params.url, params.transition); |
54 nav_params.referrer = params.referrer; | 54 nav_params.referrer = params.referrer; |
55 if (source && source->IsCrashed() && | 55 if (source && source->IsCrashed() && |
56 params.disposition == CURRENT_TAB && | 56 params.disposition == CURRENT_TAB && |
57 params.transition == ui::PAGE_TRANSITION_LINK) { | 57 params.transition == ui::PAGE_TRANSITION_LINK) { |
58 nav_params.disposition = NEW_FOREGROUND_TAB; | 58 nav_params.disposition = NEW_FOREGROUND_TAB; |
(...skipping 29 matching lines...) Expand all Loading... |
88 | 88 |
89 Profile* profile = Profile::FromBrowserContext(context); | 89 Profile* profile = Profile::FromBrowserContext(context); |
90 | 90 |
91 chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; | 91 chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; |
92 if (source) { | 92 if (source) { |
93 Browser* source_browser = chrome::FindBrowserWithWebContents(source); | 93 Browser* source_browser = chrome::FindBrowserWithWebContents(source); |
94 if (source_browser) | 94 if (source_browser) |
95 desktop_type = source_browser->host_desktop_type(); | 95 desktop_type = source_browser->host_desktop_type(); |
96 } | 96 } |
97 | 97 |
98 Browser* browser = chrome::FindTabbedBrowser(profile, false, desktop_type); | 98 Browser* browser = chrome::FindTabbedBrowser(profile, false); |
99 const bool browser_created = !browser; | 99 const bool browser_created = !browser; |
100 if (!browser) | 100 if (!browser) |
101 browser = new Browser( | 101 browser = new Browser( |
102 Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); | 102 Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); |
103 chrome::NavigateParams params(browser, new_contents); | 103 chrome::NavigateParams params(browser, new_contents); |
104 params.source_contents = source; | 104 params.source_contents = source; |
105 params.disposition = disposition; | 105 params.disposition = disposition; |
106 params.window_bounds = initial_rect; | 106 params.window_bounds = initial_rect; |
107 params.window_action = chrome::NavigateParams::SHOW_WINDOW; | 107 params.window_action = chrome::NavigateParams::SHOW_WINDOW; |
108 params.user_gesture = true; | 108 params.user_gesture = true; |
109 chrome::Navigate(¶ms); | 109 chrome::Navigate(¶ms); |
110 | 110 |
111 // Close the browser if chrome::Navigate created a new one. | 111 // Close the browser if chrome::Navigate created a new one. |
112 if (browser_created && (browser != params.browser)) | 112 if (browser_created && (browser != params.browser)) |
113 browser->window()->Close(); | 113 browser->window()->Close(); |
114 } | 114 } |
OLD | NEW |