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 22 matching lines...) Expand all Loading... |
33 content::BrowserContext* context, | 33 content::BrowserContext* context, |
34 WebContents* source, | 34 WebContents* source, |
35 const OpenURLParams& params) { | 35 const OpenURLParams& params) { |
36 if (!context) | 36 if (!context) |
37 return NULL; | 37 return NULL; |
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 = browser::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 = browser::FindTabbedBrowser(profile, false, desktop_type); | 48 Browser* browser = browser::FindTabbedBrowser(profile, false, desktop_type); |
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); |
(...skipping 30 matching lines...) Expand all Loading... |
84 WindowOpenDisposition disposition, | 84 WindowOpenDisposition disposition, |
85 const gfx::Rect& initial_pos, | 85 const gfx::Rect& initial_pos, |
86 bool user_gesture) { | 86 bool user_gesture) { |
87 if (!context) | 87 if (!context) |
88 return; | 88 return; |
89 | 89 |
90 Profile* profile = Profile::FromBrowserContext(context); | 90 Profile* profile = Profile::FromBrowserContext(context); |
91 | 91 |
92 chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; | 92 chrome::HostDesktopType desktop_type = chrome::HOST_DESKTOP_TYPE_NATIVE; |
93 if (source) { | 93 if (source) { |
94 Browser* source_browser = browser::FindBrowserWithWebContents(source); | 94 Browser* source_browser = chrome::FindBrowserWithWebContents(source); |
95 if (source_browser) | 95 if (source_browser) |
96 desktop_type = source_browser->host_desktop_type(); | 96 desktop_type = source_browser->host_desktop_type(); |
97 } | 97 } |
98 | 98 |
99 Browser* browser = browser::FindTabbedBrowser(profile, false, desktop_type); | 99 Browser* browser = browser::FindTabbedBrowser(profile, false, desktop_type); |
100 const bool browser_created = !browser; | 100 const bool browser_created = !browser; |
101 if (!browser) | 101 if (!browser) |
102 browser = new Browser( | 102 browser = new Browser( |
103 Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); | 103 Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); |
104 TabContents* tab_contents = | 104 TabContents* tab_contents = |
105 TabContents::Factory::CreateTabContents(new_contents); | 105 TabContents::Factory::CreateTabContents(new_contents); |
106 chrome::NavigateParams params(browser, tab_contents); | 106 chrome::NavigateParams params(browser, tab_contents); |
107 // TODO(pinkerton): no way to get a TabContents for this. | 107 // TODO(pinkerton): no way to get a TabContents for this. |
108 // params.source_contents = source; | 108 // params.source_contents = source; |
109 params.disposition = disposition; | 109 params.disposition = disposition; |
110 params.window_bounds = initial_pos; | 110 params.window_bounds = initial_pos; |
111 params.window_action = chrome::NavigateParams::SHOW_WINDOW; | 111 params.window_action = chrome::NavigateParams::SHOW_WINDOW; |
112 params.user_gesture = true; | 112 params.user_gesture = true; |
113 chrome::Navigate(¶ms); | 113 chrome::Navigate(¶ms); |
114 | 114 |
115 // Close the browser if chrome::Navigate created a new one. | 115 // Close the browser if chrome::Navigate created a new one. |
116 if (browser_created && (browser != params.browser)) | 116 if (browser_created && (browser != params.browser)) |
117 browser->window()->Close(); | 117 browser->window()->Close(); |
118 } | 118 } |
OLD | NEW |