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

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

Issue 10700071: browser: Remove fullscreen functions and have callers call FullscreenController directly. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 5 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) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 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 #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 12 matching lines...) Expand all
23 #include "chrome/browser/instant/instant_controller_delegate.h" 23 #include "chrome/browser/instant/instant_controller_delegate.h"
24 #include "chrome/browser/intents/device_attached_intent_source.h" 24 #include "chrome/browser/intents/device_attached_intent_source.h"
25 #include "chrome/browser/prefs/pref_change_registrar.h" 25 #include "chrome/browser/prefs/pref_change_registrar.h"
26 #include "chrome/browser/prefs/pref_member.h" 26 #include "chrome/browser/prefs/pref_member.h"
27 #include "chrome/browser/sessions/session_id.h" 27 #include "chrome/browser/sessions/session_id.h"
28 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h" 28 #include "chrome/browser/ui/blocked_content/blocked_content_tab_helper_delegate. h"
29 #include "chrome/browser/ui/bookmarks/bookmark_bar.h" 29 #include "chrome/browser/ui/bookmarks/bookmark_bar.h"
30 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h" 30 #include "chrome/browser/ui/bookmarks/bookmark_tab_helper_delegate.h"
31 #include "chrome/browser/ui/browser_navigator.h" 31 #include "chrome/browser/ui/browser_navigator.h"
32 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h" 32 #include "chrome/browser/ui/constrained_window_tab_helper_delegate.h"
33 #include "chrome/browser/ui/fullscreen/fullscreen_exit_bubble_type.h"
34 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h" 33 #include "chrome/browser/ui/search_engines/search_engine_tab_helper_delegate.h"
35 #include "chrome/browser/ui/select_file_dialog.h" 34 #include "chrome/browser/ui/select_file_dialog.h"
36 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h" 35 #include "chrome/browser/ui/tab_contents/core_tab_helper_delegate.h"
37 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h" 36 #include "chrome/browser/ui/tabs/tab_strip_model_delegate.h"
38 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h" 37 #include "chrome/browser/ui/tabs/tab_strip_model_observer.h"
39 #include "chrome/browser/ui/toolbar/toolbar_model.h" 38 #include "chrome/browser/ui/toolbar/toolbar_model.h"
40 #include "chrome/browser/ui/zoom/zoom_observer.h" 39 #include "chrome/browser/ui/zoom/zoom_observer.h"
41 #include "chrome/common/content_settings.h" 40 #include "chrome/common/content_settings.h"
42 #include "chrome/common/content_settings_types.h" 41 #include "chrome/common/content_settings_types.h"
43 #include "chrome/common/extensions/extension_constants.h" 42 #include "chrome/common/extensions/extension_constants.h"
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
497 int index) OVERRIDE; 496 int index) OVERRIDE;
498 virtual void TabStripEmpty() OVERRIDE; 497 virtual void TabStripEmpty() OVERRIDE;
499 498
500 // Overridden from content::WebContentsDelegate: 499 // Overridden from content::WebContentsDelegate:
501 virtual bool PreHandleKeyboardEvent( 500 virtual bool PreHandleKeyboardEvent(
502 const content::NativeWebKeyboardEvent& event, 501 const content::NativeWebKeyboardEvent& event,
503 bool* is_keyboard_shortcut) OVERRIDE; 502 bool* is_keyboard_shortcut) OVERRIDE;
504 virtual void HandleKeyboardEvent( 503 virtual void HandleKeyboardEvent(
505 const content::NativeWebKeyboardEvent& event) OVERRIDE; 504 const content::NativeWebKeyboardEvent& event) OVERRIDE;
506 505
507 // Fullscreen permission infobar callbacks.
508 // TODO(koz): Remove this and have callers call FullscreenController directly.
509 void OnAcceptFullscreenPermission(const GURL& url,
510 FullscreenExitBubbleType bubble_type);
511 void OnDenyFullscreenPermission(FullscreenExitBubbleType bubble_type);
512
513 // Figure out if there are tabs that have beforeunload handlers. 506 // Figure out if there are tabs that have beforeunload handlers.
514 bool TabsNeedBeforeUnloadFired(); 507 bool TabsNeedBeforeUnloadFired();
515 508
516 bool is_type_tabbed() const { return type_ == TYPE_TABBED; } 509 bool is_type_tabbed() const { return type_ == TYPE_TABBED; }
517 bool is_type_popup() const { return type_ == TYPE_POPUP; } 510 bool is_type_popup() const { return type_ == TYPE_POPUP; }
518 bool is_type_panel() const { return type_ == TYPE_PANEL; } 511 bool is_type_panel() const { return type_ == TYPE_PANEL; }
519 512
520 bool is_app() const; 513 bool is_app() const;
521 bool is_devtools() const; 514 bool is_devtools() const;
522 515
523 // See FullscreenController::IsFullscreenForTabOrPending. 516 // See FullscreenController::IsFullscreenForTabOrPending.
524 bool IsFullscreenForTabOrPending() const; 517 bool IsFullscreenForTabOrPending() const;
525 518
526 // True when the mouse cursor is locked. 519 // True when the mouse cursor is locked.
527 bool IsMouseLocked() const; 520 bool IsMouseLocked() const;
528 521
529 // Called each time the browser window is shown. 522 // Called each time the browser window is shown.
530 void OnWindowDidShow(); 523 void OnWindowDidShow();
531 524
532 // Show the first run search engine bubble on the location bar. 525 // Show the first run search engine bubble on the location bar.
533 void ShowFirstRunBubble(); 526 void ShowFirstRunBubble();
534 527
535 void set_pending_web_app_action(WebAppAction action) { 528 void set_pending_web_app_action(WebAppAction action) {
536 pending_web_app_action_ = action; 529 pending_web_app_action_ = action;
537 } 530 }
538 531
532 FullscreenController* fullscreen_controller() {
533 return fullscreen_controller_.get();
534 }
535
539 ExtensionWindowController* extension_window_controller() const { 536 ExtensionWindowController* extension_window_controller() const {
540 return extension_window_controller_.get(); 537 return extension_window_controller_.get();
541 } 538 }
542 539
543 protected: 540 protected:
544 // Funnel for the factory method in BrowserWindow. This allows subclasses to 541 // Funnel for the factory method in BrowserWindow. This allows subclasses to
545 // set their own window. 542 // set their own window.
546 virtual BrowserWindow* CreateBrowserWindow(); 543 virtual BrowserWindow* CreateBrowserWindow();
547 544
548 private: 545 private:
(...skipping 499 matching lines...) Expand 10 before | Expand all | Expand 10 after
1048 bool window_has_shown_; 1045 bool window_has_shown_;
1049 1046
1050 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 1047 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
1051 // before DidEndColorChooser is called. 1048 // before DidEndColorChooser is called.
1052 scoped_ptr<content::ColorChooser> color_chooser_; 1049 scoped_ptr<content::ColorChooser> color_chooser_;
1053 1050
1054 DISALLOW_COPY_AND_ASSIGN(Browser); 1051 DISALLOW_COPY_AND_ASSIGN(Browser);
1055 }; 1052 };
1056 1053
1057 #endif // CHROME_BROWSER_UI_BROWSER_H_ 1054 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698