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

Side by Side Diff: chrome/browser/ui/views/frame/browser_view.h

Issue 7809013: Remove Animation When "Resuming" Window in Lion (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Adds context parameter to BrowserWindow::Show(...) Created 9 years, 3 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 231 matching lines...) Expand 10 before | Expand all | Expand 10 after
242 // Restores the focused view. This is also used to set the initial focus 242 // Restores the focused view. This is also used to set the initial focus
243 // when a new browser window is created. 243 // when a new browser window is created.
244 void RestoreFocus(); 244 void RestoreFocus();
245 245
246 // Access the CompactLocationBarHost. 246 // Access the CompactLocationBarHost.
247 CompactLocationBarViewHost* compact_location_bar_view_host() { 247 CompactLocationBarViewHost* compact_location_bar_view_host() {
248 return compact_location_bar_view_host_.get(); 248 return compact_location_bar_view_host_.get();
249 } 249 }
250 250
251 // Overridden from BrowserWindow: 251 // Overridden from BrowserWindow:
252 virtual void Show() OVERRIDE; 252 virtual void Show(BrowserWindow::ShowContext show_context) OVERRIDE;
253 virtual void ShowInactive() OVERRIDE; 253 virtual void ShowInactive() OVERRIDE;
254 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE; 254 virtual void SetBounds(const gfx::Rect& bounds) OVERRIDE;
255 virtual void Close() OVERRIDE; 255 virtual void Close() OVERRIDE;
256 virtual void Activate() OVERRIDE; 256 virtual void Activate() OVERRIDE;
257 virtual void Deactivate() OVERRIDE; 257 virtual void Deactivate() OVERRIDE;
258 virtual bool IsActive() const OVERRIDE; 258 virtual bool IsActive() const OVERRIDE;
259 virtual void FlashFrame() OVERRIDE; 259 virtual void FlashFrame() OVERRIDE;
260 virtual gfx::NativeWindow GetNativeHandle() OVERRIDE; 260 virtual gfx::NativeWindow GetNativeHandle() OVERRIDE;
261 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE; 261 virtual BrowserWindowTesting* GetBrowserWindowTesting() OVERRIDE;
262 virtual StatusBubble* GetStatusBubble() OVERRIDE; 262 virtual StatusBubble* GetStatusBubble() OVERRIDE;
(...skipping 467 matching lines...) Expand 10 before | Expand all | Expand 10 after
730 730
731 NotificationRegistrar registrar_; 731 NotificationRegistrar registrar_;
732 732
733 // Used to measure the loading spinner animation rate. 733 // Used to measure the loading spinner animation rate.
734 base::TimeTicks last_animation_time_; 734 base::TimeTicks last_animation_time_;
735 735
736 DISALLOW_COPY_AND_ASSIGN(BrowserView); 736 DISALLOW_COPY_AND_ASSIGN(BrowserView);
737 }; 737 };
738 738
739 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_ 739 #endif // CHROME_BROWSER_UI_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698