Thorium_Archive/thorium
1
0
Fork 0
Code Issues 207 Pull requests 3 Projects Releases 53 Packages Wiki Activity

Update browser_commands.cc

Browse source
This commit is contained in:
Alexander David Frick 2022-08-20 19:47:30 -05:00 committed by GitHub
parent 9fa13491cd
commit f0f9d4ceb0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
src/chrome/browser/ui/browser_commands.cc
View file

@ -78,6 +78,7 @@
#include "chrome/browser/ui/status_bubble.h" #include "chrome/browser/ui/status_bubble.h"
#include "chrome/browser/ui/tab_contents/core_tab_helper.h" #include "chrome/browser/ui/tab_contents/core_tab_helper.h"
#include "chrome/browser/ui/tab_dialogs.h" #include "chrome/browser/ui/tab_dialogs.h"
#include "chrome/browser/ui/tabs/tab_enums.h"
#include "chrome/browser/ui/tabs/tab_group.h" #include "chrome/browser/ui/tabs/tab_group.h"
#include "chrome/browser/ui/tabs/tab_group_model.h" #include "chrome/browser/ui/tabs/tab_group_model.h"
#include "chrome/browser/ui/tabs/tab_strip_user_gesture_details.h" #include "chrome/browser/ui/tabs/tab_strip_user_gesture_details.h"
@ -233,7 +234,7 @@ void CreateAndShowNewWindowWithContents(
// The page transition below is only for the purpose of inserting the tab. // The page transition below is only for the purpose of inserting the tab.
new_browser->tab_strip_model()->AddWebContents(std::move(contents), -1, new_browser->tab_strip_model()->AddWebContents(std::move(contents), -1,
ui::PAGE_TRANSITION_LINK, ui::PAGE_TRANSITION_LINK,
TabStripModel::ADD_ACTIVE); AddTabTypes::ADD_ACTIVE);
} }
bool GetTabURLAndTitleToSave(content::WebContents* web_contents, bool GetTabURLAndTitleToSave(content::WebContents* web_contents,
@ -305,8 +306,8 @@ WebContents* GetTabAndRevertIfNecessaryHelper(Browser* browser,
browser->tab_strip_model()->AddWebContents( browser->tab_strip_model()->AddWebContents(
std::move(new_tab), -1, ui::PAGE_TRANSITION_LINK, std::move(new_tab), -1, ui::PAGE_TRANSITION_LINK,
(disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB) (disposition == WindowOpenDisposition::NEW_FOREGROUND_TAB)
? TabStripModel::ADD_ACTIVE ? AddTabTypes::ADD_ACTIVE
: TabStripModel::ADD_NONE, : AddTabTypes::ADD_NONE,
group); group);
return raw_new_tab; return raw_new_tab;
} }
@ -317,7 +318,7 @@ WebContents* GetTabAndRevertIfNecessaryHelper(Browser* browser,
Browser::Create(Browser::CreateParams(browser->profile(), true)); Browser::Create(Browser::CreateParams(browser->profile(), true));
new_browser->tab_strip_model()->AddWebContents(std::move(new_tab), -1, new_browser->tab_strip_model()->AddWebContents(std::move(new_tab), -1,
ui::PAGE_TRANSITION_LINK, ui::PAGE_TRANSITION_LINK,
TabStripModel::ADD_ACTIVE); AddTabTypes::ADD_ACTIVE);
new_browser->window()->Show(); new_browser->window()->Show();
return raw_new_tab; return raw_new_tab;
} }
@ -651,7 +652,7 @@ base::WeakPtr<content::NavigationHandle> OpenCurrentURL(Browser* browser) {
// should be inherited, in which case the group is inherited instead of the // should be inherited, in which case the group is inherited instead of the
// opener. // opener.
params.tabstrip_add_types = params.tabstrip_add_types =
TabStripModel::ADD_FORCE_INDEX | TabStripModel::ADD_INHERIT_OPENER; AddTabTypes::ADD_FORCE_INDEX | AddTabTypes::ADD_INHERIT_OPENER;
params.input_start = location_bar->GetMatchSelectionTimestamp(); params.input_start = location_bar->GetMatchSelectionTimestamp();
params.is_using_https_as_default_scheme = params.is_using_https_as_default_scheme =
location_bar->IsInputTypedUrlWithoutScheme(); location_bar->IsInputTypedUrlWithoutScheme();
@ -734,8 +735,8 @@ void NewTab(Browser* browser) {
// TODO(asvitkine): This is invoked programmatically from several places. // TODO(asvitkine): This is invoked programmatically from several places.
// Audit the code and change it so that the histogram only gets collected for // Audit the code and change it so that the histogram only gets collected for
// user-initiated commands. // user-initiated commands.
UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", TabStripModel::NEW_TAB_COMMAND, UMA_HISTOGRAM_ENUMERATION("Tab.NewTab", NewTabTypes::NEW_TAB_COMMAND,
TabStripModel::NEW_TAB_ENUM_COUNT); NewTabTypes::NEW_TAB_ENUM_COUNT);
// Notify IPH that new tab was opened. // Notify IPH that new tab was opened.
auto* reopen_tab_iph = auto* reopen_tab_iph =
@ -903,12 +904,12 @@ void MoveTabsToNewWindow(Browser* browser,
browser->tab_strip_model()->DetachWebContentsAtForInsertion( browser->tab_strip_model()->DetachWebContentsAtForInsertion(
adjusted_index); adjusted_index);
int add_types = pinned ? TabStripModel::ADD_PINNED : 0; int add_types = pinned ? AddTabTypes::ADD_PINNED : 0;
// The last tab made active takes precedence, so activate the last active // The last tab made active takes precedence, so activate the last active
// tab, with a fallback for the first tab (i == 0) if the active tab isn’t // tab, with a fallback for the first tab (i == 0) if the active tab isn’t
// in the set of tabs being moved. // in the set of tabs being moved.
if (i == 0 || tab_indices[i] == active_index) if (i == 0 || tab_indices[i] == active_index)
add_types = add_types | TabStripModel::ADD_ACTIVE; add_types = add_types | AddTabTypes::ADD_ACTIVE;
new_browser->tab_strip_model()->AddWebContents(std::move(contents_move), -1, new_browser->tab_strip_model()->AddWebContents(std::move(contents_move), -1,
ui::PAGE_TRANSITION_TYPED, ui::PAGE_TRANSITION_TYPED,
@ -942,9 +943,8 @@ WebContents* DuplicateTabAt(Browser* browser, int index) {
TabStripModel* tab_strip_model = browser->tab_strip_model(); TabStripModel* tab_strip_model = browser->tab_strip_model();
const int contents_index = tab_strip_model->GetIndexOfWebContents(contents); const int contents_index = tab_strip_model->GetIndexOfWebContents(contents);
pinned = tab_strip_model->IsTabPinned(contents_index); pinned = tab_strip_model->IsTabPinned(contents_index);
int add_types = TabStripModel::ADD_ACTIVE | int add_types = AddTabTypes::ADD_ACTIVE | AddTabTypes::ADD_INHERIT_OPENER |
TabStripModel::ADD_INHERIT_OPENER | (pinned ? AddTabTypes::ADD_PINNED : 0);
(pinned ? TabStripModel::ADD_PINNED : 0);
const auto old_group = tab_strip_model->GetTabGroupForTab(contents_index); const auto old_group = tab_strip_model->GetTabGroupForTab(contents_index);
tab_strip_model->InsertWebContentsAt( tab_strip_model->InsertWebContentsAt(
contents_index + 1, std::move(contents_dupe), add_types, old_group); contents_index + 1, std::move(contents_dupe), add_types, old_group);
@ -978,8 +978,8 @@ void MoveTabsToExistingWindow(Browser* source,
std::unique_ptr<WebContents> contents_move = std::unique_ptr<WebContents> contents_move =
source->tab_strip_model()->DetachWebContentsAtForInsertion( source->tab_strip_model()->DetachWebContentsAtForInsertion(
adjusted_index); adjusted_index);
int add_types = TabStripModel::ADD_ACTIVE | int add_types =
(pinned ? TabStripModel::ADD_PINNED : 0); AddTabTypes::ADD_ACTIVE | (pinned ? AddTabTypes::ADD_PINNED : 0);
target->tab_strip_model()->AddWebContents( target->tab_strip_model()->AddWebContents(
std::move(contents_move), -1, ui::PAGE_TRANSITION_TYPED, add_types); std::move(contents_move), -1, ui::PAGE_TRANSITION_TYPED, add_types);
} }