chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc - Issue 1827083004: UI: Rename MediaState to AlertState

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 1827083004: UI: Rename MediaState to AlertState (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@bluetooth-tab-indicator

Patch Set: Keep gypi ordered Created 4 years, 9 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 side-by-side diff with in-line comments

Download patch

« no previous file with comments | « chrome/browser/ui/views/tabs/alert_indicator_button_unittest.cc ('k') | chrome/browser/ui/views/tabs/media_indicator_button.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

diff --git a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

index defa83832ff8b72ee3e92f59f9e24730d9e5233c..0ee2eaecea2ac3c70d979b4c4edcd498f7fed09a 100644

--- a/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

+++ b/chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

@@ -295,7 +295,7 @@ void BrowserTabStripController::CloseTab(int model_index,

void BrowserTabStripController::ToggleTabAudioMute(int model_index) {

content::WebContents* const contents = model_->GetWebContentsAt(model_index);

chrome::SetTabAudioMuted(contents, !contents->IsAudioMuted(),

- TAB_MUTED_REASON_AUDIO_INDICATOR, std::string());

+ TabMutedReason::AUDIO_INDICATOR, std::string());

}

void BrowserTabStripController::ShowContextMenuForTab(

@@ -505,7 +505,7 @@ void BrowserTabStripController::SetTabRendererDataFromModel(

data->show_icon = data->pinned || favicon::ShouldDisplayFavicon(contents);

data->blocked = model_->IsTabBlocked(model_index);

data->app = extensions::TabHelper::FromWebContents(contents)->is_app();

- data->media_state = chrome::GetTabMediaStateForContents(contents);

+ data->alert_state = chrome::GetTabAlertStateForContents(contents);

}

void BrowserTabStripController::SetTabDataAt(content::WebContents* web_contents,