Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(121)

Side by Side Diff: chrome/browser/ui/webui/chrome_web_contents_handler.cc

Issue 562603002: Move PageTransition from //content/public/common to //ui/base (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 6 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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 35 matching lines...) Expand 10 before | Expand all | Expand 10 after
46 46
47 Browser* browser = chrome::FindTabbedBrowser(profile, false, desktop_type); 47 Browser* browser = chrome::FindTabbedBrowser(profile, false, desktop_type);
48 const bool browser_created = !browser; 48 const bool browser_created = !browser;
49 if (!browser) 49 if (!browser)
50 browser = new Browser( 50 browser = new Browser(
51 Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type)); 51 Browser::CreateParams(Browser::TYPE_TABBED, profile, desktop_type));
52 chrome::NavigateParams nav_params(browser, params.url, params.transition); 52 chrome::NavigateParams nav_params(browser, params.url, params.transition);
53 nav_params.referrer = params.referrer; 53 nav_params.referrer = params.referrer;
54 if (source && source->IsCrashed() && 54 if (source && source->IsCrashed() &&
55 params.disposition == CURRENT_TAB && 55 params.disposition == CURRENT_TAB &&
56 params.transition == content::PAGE_TRANSITION_LINK) { 56 params.transition == ui::PAGE_TRANSITION_LINK) {
57 nav_params.disposition = NEW_FOREGROUND_TAB; 57 nav_params.disposition = NEW_FOREGROUND_TAB;
58 } else { 58 } else {
59 nav_params.disposition = params.disposition; 59 nav_params.disposition = params.disposition;
60 } 60 }
61 nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW; 61 nav_params.window_action = chrome::NavigateParams::SHOW_WINDOW;
62 nav_params.user_gesture = true; 62 nav_params.user_gesture = true;
63 chrome::Navigate(&nav_params); 63 chrome::Navigate(&nav_params);
64 64
65 // Close the browser if chrome::Navigate created a new one. 65 // Close the browser if chrome::Navigate created a new one.
66 if (browser_created && (browser != nav_params.browser)) 66 if (browser_created && (browser != nav_params.browser))
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 params.disposition = disposition; 104 params.disposition = disposition;
105 params.window_bounds = initial_pos; 105 params.window_bounds = initial_pos;
106 params.window_action = chrome::NavigateParams::SHOW_WINDOW; 106 params.window_action = chrome::NavigateParams::SHOW_WINDOW;
107 params.user_gesture = true; 107 params.user_gesture = true;
108 chrome::Navigate(&params); 108 chrome::Navigate(&params);
109 109
110 // Close the browser if chrome::Navigate created a new one. 110 // Close the browser if chrome::Navigate created a new one.
111 if (browser_created && (browser != params.browser)) 111 if (browser_created && (browser != params.browser))
112 browser->window()->Close(); 112 browser->window()->Close();
113 } 113 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698