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 <windows.h> | 8 #include <windows.h> |
9 #include <shellapi.h> | 9 #include <shellapi.h> |
10 #endif // OS_WIN | 10 #endif // OS_WIN |
(...skipping 592 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
603 browser->window()->Show(); | 603 browser->window()->Show(); |
604 } | 604 } |
605 | 605 |
606 // static | 606 // static |
607 TabContents* Browser::OpenApplication( | 607 TabContents* Browser::OpenApplication( |
608 Profile* profile, | 608 Profile* profile, |
609 const Extension* extension, | 609 const Extension* extension, |
610 extension_misc::LaunchContainer container, | 610 extension_misc::LaunchContainer container, |
611 const GURL& override_url, | 611 const GURL& override_url, |
612 WindowOpenDisposition disposition) { | 612 WindowOpenDisposition disposition) { |
613 #if defined(USE_AURA) | 613 #if defined(USE_AURA) |
Ben Goodger (Google)
2011/11/15 23:27:28
I actually think we should remove this. Discussion
| |
614 // On aura we're experimenting with making all apps open in windows. | 614 // On aura we're experimenting with making all apps open in windows. |
615 // NOTE: Update BrowserInitTest.OpenAppShortcutPanel if this is changed. | |
615 container = extension_misc::LAUNCH_WINDOW; | 616 container = extension_misc::LAUNCH_WINDOW; |
616 #endif | 617 #endif |
617 TabContents* tab = NULL; | 618 TabContents* tab = NULL; |
618 ExtensionPrefs* prefs = profile->GetExtensionService()->extension_prefs(); | 619 ExtensionPrefs* prefs = profile->GetExtensionService()->extension_prefs(); |
619 prefs->SetActiveBit(extension->id(), true); | 620 prefs->SetActiveBit(extension->id(), true); |
620 | 621 |
621 UMA_HISTOGRAM_ENUMERATION("Extensions.AppLaunchContainer", container, 100); | 622 UMA_HISTOGRAM_ENUMERATION("Extensions.AppLaunchContainer", container, 100); |
622 | 623 |
623 switch (container) { | 624 switch (container) { |
624 case extension_misc::LAUNCH_WINDOW: | 625 case extension_misc::LAUNCH_WINDOW: |
(...skipping 4896 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
5521 } | 5522 } |
5522 | 5523 |
5523 void Browser::UpdateFullscreenExitBubbleContent() { | 5524 void Browser::UpdateFullscreenExitBubbleContent() { |
5524 GURL url; | 5525 GURL url; |
5525 if (fullscreened_tab_) | 5526 if (fullscreened_tab_) |
5526 url = fullscreened_tab_->tab_contents()->GetURL(); | 5527 url = fullscreened_tab_->tab_contents()->GetURL(); |
5527 | 5528 |
5528 window_->UpdateFullscreenExitBubbleContent( | 5529 window_->UpdateFullscreenExitBubbleContent( |
5529 url, GetFullscreenExitBubbleType()); | 5530 url, GetFullscreenExitBubbleType()); |
5530 } | 5531 } |
OLD | NEW |