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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
7 #pragma once 7 #pragma once
8 8
9 #include <map> 9 #include <map>
10 #include <string> 10 #include <string>
(...skipping 236 matching lines...) Expand 10 before | Expand all | Expand 10 after
247 virtual void UpdateTitleBar() OVERRIDE; 247 virtual void UpdateTitleBar() OVERRIDE;
248 virtual void BookmarkBarStateChanged( 248 virtual void BookmarkBarStateChanged(
249 BookmarkBar::AnimateChangeType change_type) OVERRIDE; 249 BookmarkBar::AnimateChangeType change_type) OVERRIDE;
250 virtual void UpdateDevTools() OVERRIDE; 250 virtual void UpdateDevTools() OVERRIDE;
251 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE; 251 virtual void UpdateLoadingAnimations(bool should_animate) OVERRIDE;
252 virtual void SetStarredState(bool is_starred) OVERRIDE; 252 virtual void SetStarredState(bool is_starred) OVERRIDE;
253 virtual gfx::Rect GetRestoredBounds() const OVERRIDE; 253 virtual gfx::Rect GetRestoredBounds() const OVERRIDE;
254 virtual gfx::Rect GetBounds() const OVERRIDE; 254 virtual gfx::Rect GetBounds() const OVERRIDE;
255 virtual bool IsMaximized() const OVERRIDE; 255 virtual bool IsMaximized() const OVERRIDE;
256 virtual bool IsMinimized() const OVERRIDE; 256 virtual bool IsMinimized() const OVERRIDE;
257 virtual void SetFullscreen(bool fullscreen) OVERRIDE; 257 virtual void SetFullscreen(bool fullscreen,
258 const GURL& url,
259 bool ask_permission) OVERRIDE;
258 virtual bool IsFullscreen() const OVERRIDE; 260 virtual bool IsFullscreen() const OVERRIDE;
259 virtual LocationBar* GetLocationBar() const OVERRIDE; 261 virtual LocationBar* GetLocationBar() const OVERRIDE;
260 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; 262 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
261 virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE; 263 virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE;
262 virtual void UpdateToolbar(TabContentsWrapper* contents, 264 virtual void UpdateToolbar(TabContentsWrapper* contents,
263 bool should_restore_state) OVERRIDE; 265 bool should_restore_state) OVERRIDE;
264 virtual void FocusToolbar() OVERRIDE; 266 virtual void FocusToolbar() OVERRIDE;
265 virtual void FocusAppMenu() OVERRIDE; 267 virtual void FocusAppMenu() OVERRIDE;
266 virtual void FocusBookmarksToolbar() OVERRIDE; 268 virtual void FocusBookmarksToolbar() OVERRIDE;
267 virtual void FocusChromeOSStatus() OVERRIDE {} 269 virtual void FocusChromeOSStatus() OVERRIDE {}
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
493 // the new_view is added. This is intended to be used when swapping in/out 495 // the new_view is added. This is intended to be used when swapping in/out
494 // child views that are referenced via a field. 496 // child views that are referenced via a field.
495 // Returns true if anything was changed, and a re-Layout is now required. 497 // Returns true if anything was changed, and a re-Layout is now required.
496 bool UpdateChildViewAndLayout(views::View* new_view, views::View** old_view); 498 bool UpdateChildViewAndLayout(views::View* new_view, views::View** old_view);
497 499
498 // Invoked to update the necessary things when our fullscreen state changes 500 // Invoked to update the necessary things when our fullscreen state changes
499 // to |fullscreen|. On Windows this is invoked immediately when we toggle the 501 // to |fullscreen|. On Windows this is invoked immediately when we toggle the
500 // full screen state. On Linux changing the fullscreen state is async, so we 502 // full screen state. On Linux changing the fullscreen state is async, so we
501 // ask the window to change it's fullscreen state, then when we get 503 // ask the window to change it's fullscreen state, then when we get
502 // notification that it succeeded this method is invoked. 504 // notification that it succeeded this method is invoked.
503 void ProcessFullscreen(bool fullscreen); 505 // If |url| is not empty, it is the URL of the page that requested fullscreen
506 // (via the fullscreen JS API).
507 // |ask_permission| determines whether the user should be asked to allow the
508 // site to remain fullscreen.
509 void ProcessFullscreen(bool fullscreen, const GURL& url, bool ask_permission);
504 510
505 // Copy the accelerator table from the app resources into something we can 511 // Copy the accelerator table from the app resources into something we can
506 // use. 512 // use.
507 void LoadAccelerators(); 513 void LoadAccelerators();
508 514
509 #if defined(OS_WIN) 515 #if defined(OS_WIN)
510 // Builds the correct menu for when we have minimal chrome. 516 // Builds the correct menu for when we have minimal chrome.
511 void BuildSystemMenuForBrowserWindow(); 517 void BuildSystemMenuForBrowserWindow();
512 void BuildSystemMenuForAppOrPopupWindow(); 518 void BuildSystemMenuForAppOrPopupWindow();
513 519
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
693 base::TimeTicks last_animation_time_; 699 base::TimeTicks last_animation_time_;
694 700
695 // If this flag is set then SetFocusToLocationBar() will set focus to the 701 // If this flag is set then SetFocusToLocationBar() will set focus to the
696 // location bar even if the browser window is not active. 702 // location bar even if the browser window is not active.
697 bool force_location_bar_focus_; 703 bool force_location_bar_focus_;
698 704
699 DISALLOW_COPY_AND_ASSIGN(BrowserView); 705 DISALLOW_COPY_AND_ASSIGN(BrowserView);
700 }; 706 };
701 707
702 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 708 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698