| 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 "base/prefs/pref_service.h" | 9 #include "base/prefs/pref_service.h" |
| 10 #include "chrome/browser/browser_process.h" | 10 #include "chrome/browser/browser_process.h" |
| (...skipping 369 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 380 immersive_reveal_lock_.reset( | 380 immersive_reveal_lock_.reset( |
| 381 browser_view->immersive_mode_controller()->GetRevealedLock( | 381 browser_view->immersive_mode_controller()->GetRevealedLock( |
| 382 ImmersiveModeController::ANIMATE_REVEAL_NO)); | 382 ImmersiveModeController::ANIMATE_REVEAL_NO)); |
| 383 } | 383 } |
| 384 } | 384 } |
| 385 | 385 |
| 386 void BrowserTabStripController::OnStoppedDraggingTabs() { | 386 void BrowserTabStripController::OnStoppedDraggingTabs() { |
| 387 immersive_reveal_lock_.reset(); | 387 immersive_reveal_lock_.reset(); |
| 388 } | 388 } |
| 389 | 389 |
| 390 Profile* BrowserTabStripController::GetProfile() { |
| 391 return model_->profile(); |
| 392 } |
| 393 |
| 390 //////////////////////////////////////////////////////////////////////////////// | 394 //////////////////////////////////////////////////////////////////////////////// |
| 391 // BrowserTabStripController, TabStripModelObserver implementation: | 395 // BrowserTabStripController, TabStripModelObserver implementation: |
| 392 | 396 |
| 393 void BrowserTabStripController::TabInsertedAt(WebContents* contents, | 397 void BrowserTabStripController::TabInsertedAt(WebContents* contents, |
| 394 int model_index, | 398 int model_index, |
| 395 bool is_active) { | 399 bool is_active) { |
| 396 DCHECK(contents); | 400 DCHECK(contents); |
| 397 DCHECK(model_->ContainsIndex(model_index)); | 401 DCHECK(model_->ContainsIndex(model_index)); |
| 398 AddTab(contents, model_index, is_active); | 402 AddTab(contents, model_index, is_active); |
| 399 } | 403 } |
| (...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 525 tabstrip_->AddTabAt(index, data, is_active); | 529 tabstrip_->AddTabAt(index, data, is_active); |
| 526 } | 530 } |
| 527 | 531 |
| 528 void BrowserTabStripController::UpdateLayoutType() { | 532 void BrowserTabStripController::UpdateLayoutType() { |
| 529 bool adjust_layout = false; | 533 bool adjust_layout = false; |
| 530 TabStripLayoutType layout_type = | 534 TabStripLayoutType layout_type = |
| 531 DetermineTabStripLayout(g_browser_process->local_state(), | 535 DetermineTabStripLayout(g_browser_process->local_state(), |
| 532 browser_->host_desktop_type(), &adjust_layout); | 536 browser_->host_desktop_type(), &adjust_layout); |
| 533 tabstrip_->SetLayoutType(layout_type, adjust_layout); | 537 tabstrip_->SetLayoutType(layout_type, adjust_layout); |
| 534 } | 538 } |
| OLD | NEW |