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 25 matching lines...) Expand all Loading... |
36 return NULL; | 36 return NULL; |
37 | 37 |
38 Profile* profile = Profile::FromBrowserContext(context); | 38 Profile* profile = Profile::FromBrowserContext(context); |
39 | 39 |
40 Browser* browser = chrome::FindTabbedBrowser(profile, false); | 40 Browser* browser = chrome::FindTabbedBrowser(profile, false); |
41 const bool browser_created = !browser; | 41 const bool browser_created = !browser; |
42 if (!browser) | 42 if (!browser) |
43 browser = new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile)); | 43 browser = new Browser(Browser::CreateParams(Browser::TYPE_TABBED, profile)); |
44 chrome::NavigateParams nav_params(browser, params.url, params.transition); | 44 chrome::NavigateParams nav_params(browser, params.url, params.transition); |
45 nav_params.referrer = params.referrer; | 45 nav_params.referrer = params.referrer; |
46 if (source && source->IsCrashed() && params.disposition == CURRENT_TAB && | 46 if (source && source->IsCrashed() && |
| 47 params.disposition == WindowOpenDisposition::CURRENT_TAB && |
47 ui::PageTransitionCoreTypeIs(params.transition, | 48 ui::PageTransitionCoreTypeIs(params.transition, |
48 ui::PAGE_TRANSITION_LINK)) { | 49 ui::PAGE_TRANSITION_LINK)) { |
49 nav_params.disposition = NEW_FOREGROUND_TAB; | 50 nav_params.disposition = WindowOpenDisposition::NEW_FOREGROUND_TAB; |
50 } else { | 51 } else { |
51 nav_params.disposition = params.disposition; | 52 nav_params.disposition = params.disposition; |
52 } | 53 } |
53 nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW; | 54 nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW; |
54 nav_params.user_gesture = true; | 55 nav_params.user_gesture = true; |
55 chrome::Navigate(&nav_params); | 56 chrome::Navigate(&nav_params); |
56 | 57 |
57 // Close the browser if chrome::Navigate created a new one. | 58 // Close the browser if chrome::Navigate created a new one. |
58 if (browser_created && (browser != nav_params.browser)) | 59 if (browser_created && (browser != nav_params.browser)) |
59 browser->window()->Close(); | 60 browser->window()->Close(); |
(...skipping 28 matching lines...) Expand all Loading... |
88 params.disposition = disposition; | 89 params.disposition = disposition; |
89 params.window_bounds = initial_rect; | 90 params.window_bounds = initial_rect; |
90 params.window_action = chrome::NavigateParams::SHOW_WINDOW; | 91 params.window_action = chrome::NavigateParams::SHOW_WINDOW; |
91 params.user_gesture = true; | 92 params.user_gesture = true; |
92 chrome::Navigate(¶ms); | 93 chrome::Navigate(¶ms); |
93 | 94 |
94 // Close the browser if chrome::Navigate created a new one. | 95 // Close the browser if chrome::Navigate created a new one. |
95 if (browser_created && (browser != params.browser)) | 96 if (browser_created && (browser != params.browser)) |
96 browser->window()->Close(); | 97 browser->window()->Close(); |
97 } | 98 } |
OLD | NEW |