OLD | NEW |
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" |
(...skipping 433 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
444 data->network_state = TabContentsNetworkState(contents); | 444 data->network_state = TabContentsNetworkState(contents); |
445 data->title = contents->GetTitle(); | 445 data->title = contents->GetTitle(); |
446 data->url = contents->GetURL(); | 446 data->url = contents->GetURL(); |
447 data->loading = contents->IsLoading(); | 447 data->loading = contents->IsLoading(); |
448 data->crashed_status = contents->GetCrashedStatus(); | 448 data->crashed_status = contents->GetCrashedStatus(); |
449 data->incognito = contents->GetBrowserContext()->IsOffTheRecord(); | 449 data->incognito = contents->GetBrowserContext()->IsOffTheRecord(); |
450 data->show_icon = favicon_tab_helper->ShouldDisplayFavicon(); | 450 data->show_icon = favicon_tab_helper->ShouldDisplayFavicon(); |
451 data->mini = model_->IsMiniTab(model_index); | 451 data->mini = model_->IsMiniTab(model_index); |
452 data->blocked = model_->IsTabBlocked(model_index); | 452 data->blocked = model_->IsTabBlocked(model_index); |
453 data->app = extensions::TabHelper::FromWebContents(contents)->is_app(); | 453 data->app = extensions::TabHelper::FromWebContents(contents)->is_app(); |
454 data->recording = chrome::ShouldShowRecordingIndicator(contents); | 454 if (chrome::ShouldShowProjectingIndicator(contents)) |
| 455 data->capture_state = TabRendererData::PROJECTING; |
| 456 else if (chrome::ShouldShowRecordingIndicator(contents)) |
| 457 data->capture_state = TabRendererData::RECORDING; |
| 458 else |
| 459 data->capture_state = TabRendererData::NONE; |
455 } | 460 } |
456 | 461 |
457 void BrowserTabStripController::SetTabDataAt(content::WebContents* web_contents, | 462 void BrowserTabStripController::SetTabDataAt(content::WebContents* web_contents, |
458 int model_index) { | 463 int model_index) { |
459 TabRendererData data; | 464 TabRendererData data; |
460 SetTabRendererDataFromModel(web_contents, model_index, &data, EXISTING_TAB); | 465 SetTabRendererDataFromModel(web_contents, model_index, &data, EXISTING_TAB); |
461 tabstrip_->SetTabData(model_index, data); | 466 tabstrip_->SetTabData(model_index, data); |
462 } | 467 } |
463 | 468 |
464 void BrowserTabStripController::StartHighlightTabsForCommand( | 469 void BrowserTabStripController::StartHighlightTabsForCommand( |
(...skipping 33 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
498 SetTabRendererDataFromModel(contents, index, &data, NEW_TAB); | 503 SetTabRendererDataFromModel(contents, index, &data, NEW_TAB); |
499 tabstrip_->AddTabAt(index, data, is_active); | 504 tabstrip_->AddTabAt(index, data, is_active); |
500 } | 505 } |
501 | 506 |
502 void BrowserTabStripController::UpdateLayoutType() { | 507 void BrowserTabStripController::UpdateLayoutType() { |
503 bool adjust_layout = false; | 508 bool adjust_layout = false; |
504 TabStripLayoutType layout_type = | 509 TabStripLayoutType layout_type = |
505 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout); | 510 DetermineTabStripLayout(g_browser_process->local_state(), &adjust_layout); |
506 tabstrip_->SetLayoutType(layout_type, adjust_layout); | 511 tabstrip_->SetLayoutType(layout_type, adjust_layout); |
507 } | 512 } |
OLD | NEW |