Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(606)

Side by Side Diff: chrome/browser/views/frame/browser_view.cc

Issue 385146: [Linux] Hide fullscreen bubble when kiosk mode is active. (Closed)
Patch Set: Indent 2 spaces Created 11 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/browser/gtk/browser_window_gtk.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2009 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/views/frame/browser_view.h" 5 #include "chrome/browser/views/frame/browser_view.h"
6 6
7 #if defined(OS_LINUX) 7 #if defined(OS_LINUX)
8 #include <gtk/gtk.h> 8 #include <gtk/gtk.h>
9 #endif 9 #endif
10 10
(...skipping 876 matching lines...) Expand 10 before | Expand all | Expand 10 after
887 // Notify extension shelf, so it can set itself to the appropriate drawing 887 // Notify extension shelf, so it can set itself to the appropriate drawing
888 // state. 888 // state.
889 if (extension_shelf_) 889 if (extension_shelf_)
890 extension_shelf_->OnFullscreenToggled(fullscreen); 890 extension_shelf_->OnFullscreenToggled(fullscreen);
891 891
892 // Toggle fullscreen mode. 892 // Toggle fullscreen mode.
893 frame_->GetWindow()->SetFullscreen(fullscreen); 893 frame_->GetWindow()->SetFullscreen(fullscreen);
894 894
895 if (fullscreen) { 895 if (fullscreen) {
896 #if !defined(OS_MACOSX) 896 #if !defined(OS_MACOSX)
897 bool is_kosk = 897 bool is_kiosk =
898 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode); 898 CommandLine::ForCurrentProcess()->HasSwitch(switches::kKioskMode);
899 #else 899 #else
900 bool is_kiosk = false; 900 bool is_kiosk = false;
901 #endif 901 #endif
902 if (!is_kosk) { 902 if (!is_kiosk) {
903 fullscreen_bubble_.reset(new FullscreenExitBubble(GetWidget(), 903 fullscreen_bubble_.reset(new FullscreenExitBubble(GetWidget(),
904 browser_.get())); 904 browser_.get()));
905 } 905 }
906 } else { 906 } else {
907 #if defined(OS_WIN) 907 #if defined(OS_WIN)
908 // Show the edit again since we're no longer in fullscreen mode. 908 // Show the edit again since we're no longer in fullscreen mode.
909 edit_view->set_force_hidden(false); 909 edit_view->set_force_hidden(false);
910 ShowWindow(edit_view->m_hWnd, SW_SHOW); 910 ShowWindow(edit_view->m_hWnd, SW_SHOW);
911 #endif 911 #endif
912 } 912 }
(...skipping 1369 matching lines...) Expand 10 before | Expand all | Expand 10 after
2282 2282
2283 // static 2283 // static
2284 FindBar* BrowserWindow::CreateFindBar(Browser* browser) { 2284 FindBar* BrowserWindow::CreateFindBar(Browser* browser) {
2285 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window())); 2285 return browser::CreateFindBar(static_cast<BrowserView*>(browser->window()));
2286 } 2286 }
2287 2287
2288 // static 2288 // static
2289 void BrowserList::AllBrowsersClosed() { 2289 void BrowserList::AllBrowsersClosed() {
2290 views::Window::CloseAllSecondaryWindows(); 2290 views::Window::CloseAllSecondaryWindows();
2291 } 2291 }
OLDNEW
« no previous file with comments | « chrome/browser/gtk/browser_window_gtk.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698