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" |
11 #include "base/i18n/rtl.h" | 11 #include "base/i18n/rtl.h" |
12 #include "base/metrics/histogram.h" | 12 #include "base/metrics/histogram.h" |
13 #include "base/string_number_conversions.h" | 13 #include "base/string_number_conversions.h" |
14 #include "base/utf_string_conversions.h" | 14 #include "base/utf_string_conversions.h" |
15 #include "chrome/app/chrome_command_ids.h" | 15 #include "chrome/app/chrome_command_ids.h" |
16 #include "chrome/app/chrome_dll_resource.h" | 16 #include "chrome/app/chrome_dll_resource.h" |
17 #include "chrome/browser/api/infobars/infobar_service.h" | 17 #include "chrome/browser/api/infobars/infobar_service.h" |
| 18 #include "chrome/browser/app_mode/app_mode_utils.h" |
18 #include "chrome/browser/bookmarks/bookmark_utils.h" | 19 #include "chrome/browser/bookmarks/bookmark_utils.h" |
19 #include "chrome/browser/browser_process.h" | 20 #include "chrome/browser/browser_process.h" |
20 #include "chrome/browser/extensions/tab_helper.h" | 21 #include "chrome/browser/extensions/tab_helper.h" |
21 #include "chrome/browser/managed_mode/managed_mode.h" | 22 #include "chrome/browser/managed_mode/managed_mode.h" |
22 #include "chrome/browser/native_window_notification_source.h" | 23 #include "chrome/browser/native_window_notification_source.h" |
23 #include "chrome/browser/password_manager/password_manager.h" | 24 #include "chrome/browser/password_manager/password_manager.h" |
24 #include "chrome/browser/prefs/pref_service.h" | 25 #include "chrome/browser/prefs/pref_service.h" |
25 #include "chrome/browser/profiles/avatar_menu_model.h" | 26 #include "chrome/browser/profiles/avatar_menu_model.h" |
26 #include "chrome/browser/profiles/profile.h" | 27 #include "chrome/browser/profiles/profile.h" |
27 #include "chrome/browser/profiles/profile_info_cache.h" | 28 #include "chrome/browser/profiles/profile_info_cache.h" |
(...skipping 2244 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2272 frame_->native_widget())->SetMetroSnapFullscreen(fullscreen); | 2273 frame_->native_widget())->SetMetroSnapFullscreen(fullscreen); |
2273 #endif | 2274 #endif |
2274 } else { | 2275 } else { |
2275 // Toggle fullscreen mode. | 2276 // Toggle fullscreen mode. |
2276 frame_->SetFullscreen(fullscreen); | 2277 frame_->SetFullscreen(fullscreen); |
2277 } | 2278 } |
2278 | 2279 |
2279 browser_->WindowFullscreenStateChanged(); | 2280 browser_->WindowFullscreenStateChanged(); |
2280 | 2281 |
2281 if (fullscreen) { | 2282 if (fullscreen) { |
2282 bool is_kiosk = | 2283 if (!chrome::IsRunningInAppMode() && type != FOR_METRO) { |
2283 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); | |
2284 if (!is_kiosk && type != FOR_METRO) { | |
2285 fullscreen_bubble_.reset(new FullscreenExitBubbleViews( | 2284 fullscreen_bubble_.reset(new FullscreenExitBubbleViews( |
2286 GetWidget(), browser_.get(), url, bubble_type)); | 2285 GetWidget(), browser_.get(), url, bubble_type)); |
2287 } | 2286 } |
2288 } else { | 2287 } else { |
2289 #if defined(OS_WIN) && !defined(USE_AURA) | 2288 #if defined(OS_WIN) && !defined(USE_AURA) |
2290 if (omnibox_win) { | 2289 if (omnibox_win) { |
2291 // Show the edit again since we're no longer in fullscreen mode. | 2290 // Show the edit again since we're no longer in fullscreen mode. |
2292 omnibox_win->set_force_hidden(false); | 2291 omnibox_win->set_force_hidden(false); |
2293 ShowWindow(omnibox_win->m_hWnd, SW_SHOW); | 2292 ShowWindow(omnibox_win->m_hWnd, SW_SHOW); |
2294 } | 2293 } |
(...skipping 306 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
2601 | 2600 |
2602 Browser* modal_browser = | 2601 Browser* modal_browser = |
2603 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); | 2602 chrome::FindBrowserWithWebContents(active_dialog->web_contents()); |
2604 if (modal_browser && (browser_ != modal_browser)) { | 2603 if (modal_browser && (browser_ != modal_browser)) { |
2605 modal_browser->window()->FlashFrame(true); | 2604 modal_browser->window()->FlashFrame(true); |
2606 modal_browser->window()->Activate(); | 2605 modal_browser->window()->Activate(); |
2607 } | 2606 } |
2608 | 2607 |
2609 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); | 2608 AppModalDialogQueue::GetInstance()->ActivateModalDialog(); |
2610 } | 2609 } |
OLD | NEW |