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

Side by Side Diff: chrome/browser/ui/views/tabs/browser_tab_strip_controller.cc

Issue 11236052: Indicate tab recording state in tab strip (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Always add capture devices Created 8 years, 2 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 | Annotate | Revision Log
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/views/tabs/browser_tab_strip_controller.h" 5 #include "chrome/browser/ui/views/tabs/browser_tab_strip_controller.h"
6 6
7 #include "base/auto_reset.h" 7 #include "base/auto_reset.h"
8 #include "base/command_line.h" 8 #include "base/command_line.h"
9 #include "chrome/browser/browser_process.h" 9 #include "chrome/browser/browser_process.h"
10 #include "chrome/browser/extensions/tab_helper.h" 10 #include "chrome/browser/extensions/tab_helper.h"
11 #include "chrome/browser/favicon/favicon_tab_helper.h" 11 #include "chrome/browser/favicon/favicon_tab_helper.h"
12 #include "chrome/browser/media/media_internals.h"
13 #include "chrome/browser/media/media_stream_capture_indicator.h"
12 #include "chrome/browser/prefs/pref_service.h" 14 #include "chrome/browser/prefs/pref_service.h"
13 #include "chrome/browser/profiles/profile.h" 15 #include "chrome/browser/profiles/profile.h"
14 #include "chrome/browser/ui/browser.h" 16 #include "chrome/browser/ui/browser.h"
15 #include "chrome/browser/ui/browser_tabstrip.h" 17 #include "chrome/browser/ui/browser_tabstrip.h"
16 #include "chrome/browser/ui/search/search.h" 18 #include "chrome/browser/ui/search/search.h"
17 #include "chrome/browser/ui/search/search_delegate.h" 19 #include "chrome/browser/ui/search/search_delegate.h"
18 #include "chrome/browser/ui/search/search_model.h" 20 #include "chrome/browser/ui/search/search_model.h"
19 #include "chrome/browser/ui/tab_contents/tab_contents.h" 21 #include "chrome/browser/ui/tab_contents/tab_contents.h"
20 #include "chrome/browser/ui/tabs/tab_menu_model.h" 22 #include "chrome/browser/ui/tabs/tab_menu_model.h"
21 #include "chrome/browser/ui/tabs/tab_strip_model.h" 23 #include "chrome/browser/ui/tabs/tab_strip_model.h"
22 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 24 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
23 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h" 25 #include "chrome/browser/ui/tabs/tab_strip_selection_model.h"
24 #include "chrome/browser/ui/views/tabs/tab.h" 26 #include "chrome/browser/ui/views/tabs/tab.h"
25 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h" 27 #include "chrome/browser/ui/views/tabs/tab_renderer_data.h"
26 #include "chrome/browser/ui/views/tabs/tab_strip.h" 28 #include "chrome/browser/ui/views/tabs/tab_strip.h"
27 #include "chrome/browser/ui/webui/instant_ui.h" 29 #include "chrome/browser/ui/webui/instant_ui.h"
28 #include "chrome/common/chrome_notification_types.h" 30 #include "chrome/common/chrome_notification_types.h"
29 #include "chrome/common/chrome_switches.h" 31 #include "chrome/common/chrome_switches.h"
30 #include "chrome/common/pref_names.h" 32 #include "chrome/common/pref_names.h"
31 #include "chrome/common/url_constants.h" 33 #include "chrome/common/url_constants.h"
32 #include "content/public/browser/notification_service.h" 34 #include "content/public/browser/notification_service.h"
35 #include "content/public/browser/render_process_host.h"
33 #include "content/public/browser/render_view_host.h" 36 #include "content/public/browser/render_view_host.h"
34 #include "content/public/browser/user_metrics.h" 37 #include "content/public/browser/user_metrics.h"
35 #include "content/public/browser/web_contents.h" 38 #include "content/public/browser/web_contents.h"
36 #include "ui/base/layout.h" 39 #include "ui/base/layout.h"
37 #include "ui/views/controls/menu/menu_item_view.h" 40 #include "ui/views/controls/menu/menu_item_view.h"
38 #include "ui/views/controls/menu/menu_model_adapter.h" 41 #include "ui/views/controls/menu/menu_model_adapter.h"
39 #include "ui/views/controls/menu/menu_runner.h" 42 #include "ui/views/controls/menu/menu_runner.h"
40 #include "ui/views/widget/widget.h" 43 #include "ui/views/widget/widget.h"
41 44
42 using content::UserMetricsAction; 45 using content::UserMetricsAction;
(...skipping 485 matching lines...) Expand 10 before | Expand all | Expand 10 after
528 data->network_state = TabContentsNetworkState(contents); 531 data->network_state = TabContentsNetworkState(contents);
529 data->title = contents->GetTitle(); 532 data->title = contents->GetTitle();
530 data->url = contents->GetURL(); 533 data->url = contents->GetURL();
531 data->loading = contents->IsLoading(); 534 data->loading = contents->IsLoading();
532 data->crashed_status = contents->GetCrashedStatus(); 535 data->crashed_status = contents->GetCrashedStatus();
533 data->incognito = contents->GetBrowserContext()->IsOffTheRecord(); 536 data->incognito = contents->GetBrowserContext()->IsOffTheRecord();
534 data->show_icon = favicon_tab_helper->ShouldDisplayFavicon(); 537 data->show_icon = favicon_tab_helper->ShouldDisplayFavicon();
535 data->mini = model_->IsMiniTab(model_index); 538 data->mini = model_->IsMiniTab(model_index);
536 data->blocked = model_->IsTabBlocked(model_index); 539 data->blocked = model_->IsTabBlocked(model_index);
537 data->app = extensions::TabHelper::FromWebContents(contents)->is_app(); 540 data->app = extensions::TabHelper::FromWebContents(contents)->is_app();
541 int render_process_id = contents->GetRenderProcessHost()->GetID();
542 int render_view_id = contents->GetRenderViewHost()->GetRoutingID();
543 data->recording =
544 MediaInternals::GetInstance()->media_stream_capture_indicator()->
545 IsProcessCapturing(render_process_id, render_view_id);
538 data->mode = browser_->search_model()->mode().mode; 546 data->mode = browser_->search_model()->mode().mode;
539 // Get current gradient background animation to paint. 547 // Get current gradient background animation to paint.
540 data->gradient_background_opacity = browser_->search_delegate()-> 548 data->gradient_background_opacity = browser_->search_delegate()->
541 toolbar_search_animator().GetGradientOpacity(); 549 toolbar_search_animator().GetGradientOpacity();
542 } 550 }
543 551
544 void BrowserTabStripController::SetTabDataAt(content::WebContents* web_contents, 552 void BrowserTabStripController::SetTabDataAt(content::WebContents* web_contents,
545 int model_index) { 553 int model_index) {
546 TabRendererData data; 554 TabRendererData data;
547 SetTabRendererDataFromModel(web_contents, model_index, &data, EXISTING_TAB); 555 SetTabRendererDataFromModel(web_contents, model_index, &data, EXISTING_TAB);
(...skipping 37 matching lines...) Expand 10 before | Expand all | Expand 10 after
585 SetTabRendererDataFromModel(contents->web_contents(), index, &data, NEW_TAB); 593 SetTabRendererDataFromModel(contents->web_contents(), index, &data, NEW_TAB);
586 tabstrip_->AddTabAt(index, data, is_active); 594 tabstrip_->AddTabAt(index, data, is_active);
587 } 595 }
588 596
589 void BrowserTabStripController::UpdateLayoutType() { 597 void BrowserTabStripController::UpdateLayoutType() {
590 bool adjust_layout = false; 598 bool adjust_layout = false;
591 TabStripLayoutType layout_type = 599 TabStripLayoutType layout_type =
592 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout); 600 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout);
593 tabstrip_->SetLayoutType(layout_type, adjust_layout); 601 tabstrip_->SetLayoutType(layout_type, adjust_layout);
594 } 602 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/views/tabs/base_tab.cc ('k') | chrome/browser/ui/views/tabs/tab_renderer_data.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698