| 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/browser.h" | 5 #include "chrome/browser/ui/browser.h" |
| 6 | 6 |
| 7 #if defined(OS_WIN) | 7 #if defined(OS_WIN) |
| 8 #include <windows.h> | 8 #include <windows.h> |
| 9 #include <shellapi.h> | 9 #include <shellapi.h> |
| 10 #endif // OS_WIN | 10 #endif // OS_WIN |
| (...skipping 3491 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 3502 | 3502 |
| 3503 registrar_.Add(this, content::NOTIFICATION_INTERSTITIAL_DETACHED, | 3503 registrar_.Add(this, content::NOTIFICATION_INTERSTITIAL_DETACHED, |
| 3504 content::Source<WebContents>(contents->web_contents())); | 3504 content::Source<WebContents>(contents->web_contents())); |
| 3505 } | 3505 } |
| 3506 | 3506 |
| 3507 void Browser::TabClosingAt(TabStripModel* tab_strip_model, | 3507 void Browser::TabClosingAt(TabStripModel* tab_strip_model, |
| 3508 TabContentsWrapper* contents, | 3508 TabContentsWrapper* contents, |
| 3509 int index) { | 3509 int index) { |
| 3510 fullscreen_controller_->OnTabClosing(contents->web_contents()); | 3510 fullscreen_controller_->OnTabClosing(contents->web_contents()); |
| 3511 content::NotificationService::current()->Notify( | 3511 content::NotificationService::current()->Notify( |
| 3512 content::NOTIFICATION_TAB_CLOSING, | 3512 chrome::NOTIFICATION_TAB_CLOSING, |
| 3513 content::Source<NavigationController>( | 3513 content::Source<NavigationController>( |
| 3514 &contents->web_contents()->GetController()), | 3514 &contents->web_contents()->GetController()), |
| 3515 content::NotificationService::NoDetails()); | 3515 content::NotificationService::NoDetails()); |
| 3516 | 3516 |
| 3517 // Sever the TabContents' connection back to us. | 3517 // Sever the TabContents' connection back to us. |
| 3518 SetAsDelegate(contents, NULL); | 3518 SetAsDelegate(contents, NULL); |
| 3519 } | 3519 } |
| 3520 | 3520 |
| 3521 void Browser::TabDetachedAt(TabContentsWrapper* contents, int index) { | 3521 void Browser::TabDetachedAt(TabContentsWrapper* contents, int index) { |
| 3522 TabDetachedAtImpl(contents, index, DETACH_TYPE_DETACH); | 3522 TabDetachedAtImpl(contents, index, DETACH_TYPE_DETACH); |
| (...skipping 2167 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5690 ShowSingletonTabOverwritingNTP(params); | 5690 ShowSingletonTabOverwritingNTP(params); |
| 5691 } else { | 5691 } else { |
| 5692 LoginUIServiceFactory::GetForProfile( | 5692 LoginUIServiceFactory::GetForProfile( |
| 5693 profile()->GetOriginalProfile())->ShowLoginUI(false); | 5693 profile()->GetOriginalProfile())->ShowLoginUI(false); |
| 5694 } | 5694 } |
| 5695 } | 5695 } |
| 5696 | 5696 |
| 5697 void Browser::ToggleSpeechInput() { | 5697 void Browser::ToggleSpeechInput() { |
| 5698 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); | 5698 GetSelectedWebContents()->GetRenderViewHost()->ToggleSpeechInput(); |
| 5699 } | 5699 } |
| OLD | NEW |