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

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 comments 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 EnterFullscreen(const GURL& url, bool ask_permission) OVERRIDE;
258 virtual void ExitFullscreen() OVERRIDE;
258 virtual bool IsFullscreen() const OVERRIDE; 259 virtual bool IsFullscreen() const OVERRIDE;
259 virtual LocationBar* GetLocationBar() const OVERRIDE; 260 virtual LocationBar* GetLocationBar() const OVERRIDE;
260 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE; 261 virtual void SetFocusToLocationBar(bool select_all) OVERRIDE;
261 virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE; 262 virtual void UpdateReloadStopState(bool is_loading, bool force) OVERRIDE;
262 virtual void UpdateToolbar(TabContentsWrapper* contents, 263 virtual void UpdateToolbar(TabContentsWrapper* contents,
263 bool should_restore_state) OVERRIDE; 264 bool should_restore_state) OVERRIDE;
264 virtual void FocusToolbar() OVERRIDE; 265 virtual void FocusToolbar() OVERRIDE;
265 virtual void FocusAppMenu() OVERRIDE; 266 virtual void FocusAppMenu() OVERRIDE;
266 virtual void FocusBookmarksToolbar() OVERRIDE; 267 virtual void FocusBookmarksToolbar() OVERRIDE;
267 virtual void FocusChromeOSStatus() OVERRIDE {} 268 virtual void FocusChromeOSStatus() OVERRIDE {}
(...skipping 223 matching lines...) Expand 10 before | Expand all | Expand 10 after
491 // the new_view is added. This is intended to be used when swapping in/out 492 // the new_view is added. This is intended to be used when swapping in/out
492 // child views that are referenced via a field. 493 // child views that are referenced via a field.
493 // Returns true if anything was changed, and a re-Layout is now required. 494 // Returns true if anything was changed, and a re-Layout is now required.
494 bool UpdateChildViewAndLayout(views::View* new_view, views::View** old_view); 495 bool UpdateChildViewAndLayout(views::View* new_view, views::View** old_view);
495 496
496 // Invoked to update the necessary things when our fullscreen state changes 497 // Invoked to update the necessary things when our fullscreen state changes
497 // to |fullscreen|. On Windows this is invoked immediately when we toggle the 498 // to |fullscreen|. On Windows this is invoked immediately when we toggle the
498 // full screen state. On Linux changing the fullscreen state is async, so we 499 // full screen state. On Linux changing the fullscreen state is async, so we
499 // ask the window to change it's fullscreen state, then when we get 500 // ask the window to change it's fullscreen state, then when we get
500 // notification that it succeeded this method is invoked. 501 // notification that it succeeded this method is invoked.
501 void ProcessFullscreen(bool fullscreen); 502 // If |url| is not empty, it is the URL of the page that requested fullscreen
503 // (via the fullscreen JS API).
504 // |ask_permission| determines whether the user should be asked to allow the
505 // site to remain fullscreen.
506 void ProcessFullscreen(bool fullscreen, const GURL& url, bool ask_permission);
502 507
503 // Copy the accelerator table from the app resources into something we can 508 // Copy the accelerator table from the app resources into something we can
504 // use. 509 // use.
505 void LoadAccelerators(); 510 void LoadAccelerators();
506 511
507 #if defined(OS_WIN) 512 #if defined(OS_WIN)
508 // Builds the correct menu for when we have minimal chrome. 513 // Builds the correct menu for when we have minimal chrome.
509 void BuildSystemMenuForBrowserWindow(); 514 void BuildSystemMenuForBrowserWindow();
510 void BuildSystemMenuForAppOrPopupWindow(); 515 void BuildSystemMenuForAppOrPopupWindow();
511 516
(...skipping 179 matching lines...) Expand 10 before | Expand all | Expand 10 after
691 base::TimeTicks last_animation_time_; 696 base::TimeTicks last_animation_time_;
692 697
693 // If this flag is set then SetFocusToLocationBar() will set focus to the 698 // If this flag is set then SetFocusToLocationBar() will set focus to the
694 // location bar even if the browser window is not active. 699 // location bar even if the browser window is not active.
695 bool force_location_bar_focus_; 700 bool force_location_bar_focus_;
696 701
697 DISALLOW_COPY_AND_ASSIGN(BrowserView); 702 DISALLOW_COPY_AND_ASSIGN(BrowserView);
698 }; 703 };
699 704
700 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 705 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698