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

Side by Side Diff: chrome/browser/ui/browser_tabstrip.cc

Issue 1650923002: Revert of Make opening a new tab with the NTP use PAGE_TRANSITION_AUTO_TOPLEVEL. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 10 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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/browser_tabstrip.h" 5 #include "chrome/browser/ui/browser_tabstrip.h"
6 6
7 #include "base/command_line.h" 7 #include "base/command_line.h"
8 #include "chrome/browser/profiles/profile.h" 8 #include "chrome/browser/profiles/profile.h"
9 #include "chrome/browser/ui/browser.h" 9 #include "chrome/browser/ui/browser.h"
10 #include "chrome/browser/ui/browser_navigator.h" 10 #include "chrome/browser/ui/browser_navigator.h"
11 #include "chrome/browser/ui/browser_navigator_params.h" 11 #include "chrome/browser/ui/browser_navigator_params.h"
12 #include "chrome/browser/ui/tab_contents/core_tab_helper.h" 12 #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
13 #include "chrome/browser/ui/tabs/tab_strip_model.h" 13 #include "chrome/browser/ui/tabs/tab_strip_model.h"
14 #include "chrome/common/chrome_switches.h" 14 #include "chrome/common/chrome_switches.h"
15 #include "chrome/common/url_constants.h" 15 #include "chrome/common/url_constants.h"
16 #include "content/public/browser/navigation_entry.h" 16 #include "content/public/browser/navigation_entry.h"
17 #include "content/public/browser/render_view_host.h" 17 #include "content/public/browser/render_view_host.h"
18 #include "content/public/browser/web_contents.h" 18 #include "content/public/browser/web_contents.h"
19 19
20 namespace chrome { 20 namespace chrome {
21 21
22 void AddTabAt(Browser* browser, const GURL& url, int idx, bool foreground) { 22 void AddTabAt(Browser* browser, const GURL& url, int idx, bool foreground) {
23 // Time new tab page creation time. We keep track of the timing data in 23 // Time new tab page creation time. We keep track of the timing data in
24 // WebContents, but we want to include the time it takes to create the 24 // WebContents, but we want to include the time it takes to create the
25 // WebContents object too. 25 // WebContents object too.
26 base::TimeTicks new_tab_start_time = base::TimeTicks::Now(); 26 base::TimeTicks new_tab_start_time = base::TimeTicks::Now();
27 bool show_ntp = url.is_empty();
28 chrome::NavigateParams params(browser, 27 chrome::NavigateParams params(browser,
29 show_ntp ? GURL(chrome::kChromeUINewTabURL) : url, 28 url.is_empty() ? GURL(chrome::kChromeUINewTabURL) : url,
30 show_ntp ? ui::PAGE_TRANSITION_AUTO_TOPLEVEL : ui::PAGE_TRANSITION_TYPED); 29 ui::PAGE_TRANSITION_TYPED);
31 params.disposition = foreground ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB; 30 params.disposition = foreground ? NEW_FOREGROUND_TAB : NEW_BACKGROUND_TAB;
32 params.tabstrip_index = idx; 31 params.tabstrip_index = idx;
33 chrome::Navigate(&params); 32 chrome::Navigate(&params);
34 CoreTabHelper* core_tab_helper = 33 CoreTabHelper* core_tab_helper =
35 CoreTabHelper::FromWebContents(params.target_contents); 34 CoreTabHelper::FromWebContents(params.target_contents);
36 core_tab_helper->set_new_tab_start_time(new_tab_start_time); 35 core_tab_helper->set_new_tab_start_time(new_tab_start_time);
37 } 36 }
38 37
39 content::WebContents* AddSelectedTabWithURL( 38 content::WebContents* AddSelectedTabWithURL(
40 Browser* browser, 39 Browser* browser,
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
79 return; 78 return;
80 } 79 }
81 80
82 browser->tab_strip_model()->CloseWebContentsAt( 81 browser->tab_strip_model()->CloseWebContentsAt(
83 index, 82 index,
84 add_to_history ? TabStripModel::CLOSE_CREATE_HISTORICAL_TAB 83 add_to_history ? TabStripModel::CLOSE_CREATE_HISTORICAL_TAB
85 : TabStripModel::CLOSE_NONE); 84 : TabStripModel::CLOSE_NONE);
86 } 85 }
87 86
88 } // namespace chrome 87 } // namespace chrome
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698