OLD | NEW |
1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
6 | 6 |
7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
8 #include <shellapi.h> | 8 #include <shellapi.h> |
9 #include <windows.h> | 9 #include <windows.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 1377 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1388 tab_handler_->GetTabStripModel()->SelectNextTab(); | 1388 tab_handler_->GetTabStripModel()->SelectNextTab(); |
1389 } | 1389 } |
1390 | 1390 |
1391 void Browser::SelectPreviousTab() { | 1391 void Browser::SelectPreviousTab() { |
1392 UserMetrics::RecordAction(UserMetricsAction("SelectPrevTab"), profile_); | 1392 UserMetrics::RecordAction(UserMetricsAction("SelectPrevTab"), profile_); |
1393 tab_handler_->GetTabStripModel()->SelectPreviousTab(); | 1393 tab_handler_->GetTabStripModel()->SelectPreviousTab(); |
1394 } | 1394 } |
1395 | 1395 |
1396 void Browser::OpenTabpose() { | 1396 void Browser::OpenTabpose() { |
1397 #if defined(OS_MACOSX) | 1397 #if defined(OS_MACOSX) |
1398 if (!CommandLine::ForCurrentProcess()->HasSwitch( | |
1399 switches::kEnableExposeForTabs)) { | |
1400 return; | |
1401 } | |
1402 | |
1403 UserMetrics::RecordAction(UserMetricsAction("OpenTabpose"), profile_); | 1398 UserMetrics::RecordAction(UserMetricsAction("OpenTabpose"), profile_); |
1404 window()->OpenTabpose(); | 1399 window()->OpenTabpose(); |
1405 #else | 1400 #else |
1406 NOTREACHED(); | 1401 NOTREACHED(); |
1407 #endif | 1402 #endif |
1408 } | 1403 } |
1409 | 1404 |
1410 void Browser::MoveTabNext() { | 1405 void Browser::MoveTabNext() { |
1411 UserMetrics::RecordAction(UserMetricsAction("MoveTabNext"), profile_); | 1406 UserMetrics::RecordAction(UserMetricsAction("MoveTabNext"), profile_); |
1412 tab_handler_->GetTabStripModel()->MoveTabNext(); | 1407 tab_handler_->GetTabStripModel()->MoveTabNext(); |
(...skipping 2909 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4322 // The page transition below is only for the purpose of inserting the tab. | 4317 // The page transition below is only for the purpose of inserting the tab. |
4323 browser->AddTab(view_source_contents, PageTransition::LINK); | 4318 browser->AddTab(view_source_contents, PageTransition::LINK); |
4324 } | 4319 } |
4325 | 4320 |
4326 if (profile_->HasSessionService()) { | 4321 if (profile_->HasSessionService()) { |
4327 SessionService* session_service = profile_->GetSessionService(); | 4322 SessionService* session_service = profile_->GetSessionService(); |
4328 if (session_service) | 4323 if (session_service) |
4329 session_service->TabRestored(&view_source_contents->controller(), false); | 4324 session_service->TabRestored(&view_source_contents->controller(), false); |
4330 } | 4325 } |
4331 } | 4326 } |
OLD | NEW |