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

Side by Side Diff: chrome/browser/ui/browser.h

Issue 7740044: Implement fullscreen info bubble on Win and Mac (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: respond to commens Created 9 years, 2 months 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 | Annotate | Revision Log
OLDNEW
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 #ifndef CHROME_BROWSER_UI_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <set> 10 #include <set>
(...skipping 20 matching lines...) Expand all
31 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove 31 #include "chrome/browser/tabs/tab_strip_model_observer.h" // TODO(beng): remove
32 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h" 32 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"
33 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 33 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
34 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 34 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
35 #include "chrome/browser/ui/browser_navigator.h" 35 #include "chrome/browser/ui/browser_navigator.h"
36 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" 36 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
37 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" 37 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
38 #include "chrome/browser/ui/shell_dialogs.h" 38 #include "chrome/browser/ui/shell_dialogs.h"
39 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h" 39 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper_delegate.h"
40 #include "chrome/browser/ui/toolbar/toolbar_model.h" 40 #include "chrome/browser/ui/toolbar/toolbar_model.h"
41 #include "chrome/common/content_settings.h"
41 #include "chrome/common/content_settings_types.h" 42 #include "chrome/common/content_settings_types.h"
42 #include "chrome/common/extensions/extension_constants.h" 43 #include "chrome/common/extensions/extension_constants.h"
43 #include "content/browser/tab_contents/page_navigator.h" 44 #include "content/browser/tab_contents/page_navigator.h"
44 #include "content/browser/tab_contents/tab_contents_delegate.h" 45 #include "content/browser/tab_contents/tab_contents_delegate.h"
45 #include "content/common/notification_registrar.h" 46 #include "content/common/notification_registrar.h"
46 #include "content/common/page_transition_types.h" 47 #include "content/common/page_transition_types.h"
47 #include "content/common/page_zoom.h" 48 #include "content/common/page_zoom.h"
48 #include "ui/base/ui_base_types.h" 49 #include "ui/base/ui_base_types.h"
49 #include "ui/gfx/rect.h" 50 #include "ui/gfx/rect.h"
50 51
(...skipping 450 matching lines...) Expand 10 before | Expand all | Expand 10 after
501 void SelectPreviousTab(); 502 void SelectPreviousTab();
502 void OpenTabpose(); 503 void OpenTabpose();
503 void MoveTabNext(); 504 void MoveTabNext();
504 void MoveTabPrevious(); 505 void MoveTabPrevious();
505 void SelectNumberedTab(int index); 506 void SelectNumberedTab(int index);
506 void SelectLastTab(); 507 void SelectLastTab();
507 void DuplicateTab(); 508 void DuplicateTab();
508 void WriteCurrentURLToClipboard(); 509 void WriteCurrentURLToClipboard();
509 void ConvertPopupToTabbedBrowser(); 510 void ConvertPopupToTabbedBrowser();
510 // In kiosk mode, the first toggle is valid, the rest is discarded. 511 // In kiosk mode, the first toggle is valid, the rest is discarded.
511 void ToggleFullscreenMode(); 512 void ToggleFullscreenMode(bool from_tab);
512 #if defined(OS_MACOSX) 513 #if defined(OS_MACOSX)
513 void TogglePresentationMode(); 514 void TogglePresentationMode(bool from_tab);
514 #endif 515 #endif
515 void Exit(); 516 void Exit();
516 #if defined(OS_CHROMEOS) 517 #if defined(OS_CHROMEOS)
517 void Search(); 518 void Search();
518 void ShowKeyboardOverlay(); 519 void ShowKeyboardOverlay();
519 #endif 520 #endif
520 521
521 // Page-related commands 522 // Page-related commands
522 void BookmarkCurrentPage(); 523 void BookmarkCurrentPage();
523 void SavePage(); 524 void SavePage();
(...skipping 281 matching lines...) Expand 10 before | Expand all | Expand 10 after
805 virtual void TabMoved(TabContentsWrapper* contents, 806 virtual void TabMoved(TabContentsWrapper* contents,
806 int from_index, 807 int from_index,
807 int to_index); 808 int to_index);
808 virtual void TabReplacedAt(TabStripModel* tab_strip_model, 809 virtual void TabReplacedAt(TabStripModel* tab_strip_model,
809 TabContentsWrapper* old_contents, 810 TabContentsWrapper* old_contents,
810 TabContentsWrapper* new_contents, 811 TabContentsWrapper* new_contents,
811 int index); 812 int index);
812 virtual void TabPinnedStateChanged(TabContentsWrapper* contents, int index); 813 virtual void TabPinnedStateChanged(TabContentsWrapper* contents, int index);
813 virtual void TabStripEmpty(); 814 virtual void TabStripEmpty();
814 815
816 // Fullscreen permission infobar callbacks.
817 void OnAcceptFullscreenPermission(const GURL& url);
818 void OnDenyFullscreenPermission();
819 ContentSetting GetFullscreenSetting(const GURL& url);
820
815 // Figure out if there are tabs that have beforeunload handlers. 821 // Figure out if there are tabs that have beforeunload handlers.
816 bool TabsNeedBeforeUnloadFired(); 822 bool TabsNeedBeforeUnloadFired();
817 823
818 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } 824 bool is_type_tabbed() const { return type_ == TYPE_TABBED; }
819 bool is_type_popup() const { return type_ == TYPE_POPUP; } 825 bool is_type_popup() const { return type_ == TYPE_POPUP; }
820 bool is_type_panel() const { return type_ == TYPE_PANEL; } 826 bool is_type_panel() const { return type_ == TYPE_PANEL; }
821 827
822 bool is_app() const; 828 bool is_app() const;
823 bool is_devtools() const; 829 bool is_devtools() const;
824 830
(...skipping 577 matching lines...) Expand 10 before | Expand all | Expand 10 after
1402 // True if the current tab entered fullscreen mode via webkitRequestFullScreen 1408 // True if the current tab entered fullscreen mode via webkitRequestFullScreen
1403 bool tab_caused_fullscreen_; 1409 bool tab_caused_fullscreen_;
1404 1410
1405 // True if the browser window has been shown at least once. 1411 // True if the browser window has been shown at least once.
1406 bool window_has_shown_; 1412 bool window_has_shown_;
1407 1413
1408 DISALLOW_COPY_AND_ASSIGN(Browser); 1414 DISALLOW_COPY_AND_ASSIGN(Browser);
1409 }; 1415 };
1410 1416
1411 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1417 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698