OLD | NEW |
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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/frame/browser_view.h" | 5 #include "chrome/browser/ui/views/frame/browser_view.h" |
6 | 6 |
7 #include <algorithm> | 7 #include <algorithm> |
8 | 8 |
9 #include "base/auto_reset.h" | 9 #include "base/auto_reset.h" |
10 #include "base/command_line.h" | 10 #include "base/command_line.h" |
(...skipping 2261 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2272 frame_->native_widget())->SetMetroSnapFullscreen(fullscreen); | 2272 frame_->native_widget())->SetMetroSnapFullscreen(fullscreen); |
2273 #endif | 2273 #endif |
2274 } else { | 2274 } else { |
2275 // Toggle fullscreen mode. | 2275 // Toggle fullscreen mode. |
2276 frame_->SetFullscreen(fullscreen); | 2276 frame_->SetFullscreen(fullscreen); |
2277 } | 2277 } |
2278 | 2278 |
2279 browser_->WindowFullscreenStateChanged(); | 2279 browser_->WindowFullscreenStateChanged(); |
2280 | 2280 |
2281 if (fullscreen) { | 2281 if (fullscreen) { |
2282 bool is_kiosk = | 2282 CommandLine* command_line = CommandLine::ForCurrentProcess(); |
2283 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); | 2283 bool app_mode = command_line->HasSwitch(switches::kKioskMode) || |
2284 if (!is_kiosk && type != FOR_METRO) { | 2284 (command_line->HasSwitch(switches::kForceAppMode) && |
| 2285 command_line->HasSwitch(switches::kAppId)); |
| 2286 if (!app_mode && type != FOR_METRO) { |
2285 fullscreen_bubble_.reset(new FullscreenExitBubbleViews( | 2287 fullscreen_bubble_.reset(new FullscreenExitBubbleViews( |
2286 GetWidget(), browser_.get(), url, bubble_type)); | 2288 GetWidget(), browser_.get(), url, bubble_type)); |
2287 } | 2289 } |
2288 } else { | 2290 } else { |
2289 #if defined(OS_WIN) && !defined(USE_AURA) | 2291 #if defined(OS_WIN) && !defined(USE_AURA) |
2290 if (omnibox_win) { | 2292 if (omnibox_win) { |
2291 // Show the edit again since we're no longer in fullscreen mode. | 2293 // Show the edit again since we're no longer in fullscreen mode. |
2292 omnibox_win->set_force_hidden(false); | 2294 omnibox_win->set_force_hidden(false); |
2293 ShowWindow(omnibox_win->m_hWnd, SW_SHOW); | 2295 ShowWindow(omnibox_win->m_hWnd, SW_SHOW); |
2294 } | 2296 } |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2601 | 2603 |
2602 Browser* modal_browser = | 2604 Browser* modal_browser = |
2603 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); | 2605 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); |
2604 if (modal_browser && (browser_ != modal_browser)) { | 2606 if (modal_browser && (browser_ != modal_browser)) { |
2605 modal_browser->window()->FlashFrame(true); | 2607 modal_browser->window()->FlashFrame(true); |
2606 modal_browser->window()->Activate(); | 2608 modal_browser->window()->Activate(); |
2607 } | 2609 } |
2608 | 2610 |
2609 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2611 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
2610 } | 2612 } |
OLD | NEW |