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

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

Issue 10761: Rewire the throbber so that the timer for updating lives on BrowserView, not ... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: Created 12 years, 1 month 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) 2006-2008 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2006-2008 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_VIEWS_FRAME_BROWSER_VIEW_H_ 5 #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 6 #define CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
7 7
8 #include "chrome/browser/browser_type.h" 8 #include "chrome/browser/browser_type.h"
9 #include "chrome/browser/browser_window.h" 9 #include "chrome/browser/browser_window.h"
10 #include "chrome/browser/hang_monitor/hung_plugin_action.h" 10 #include "chrome/browser/hang_monitor/hung_plugin_action.h"
(...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after
144 virtual void Show(); 144 virtual void Show();
145 virtual void SetBounds(const gfx::Rect& bounds); 145 virtual void SetBounds(const gfx::Rect& bounds);
146 virtual void Close(); 146 virtual void Close();
147 virtual void Activate(); 147 virtual void Activate();
148 virtual void FlashFrame(); 148 virtual void FlashFrame();
149 virtual void* GetNativeHandle(); 149 virtual void* GetNativeHandle();
150 virtual TabStrip* GetTabStrip() const; 150 virtual TabStrip* GetTabStrip() const;
151 virtual StatusBubble* GetStatusBubble(); 151 virtual StatusBubble* GetStatusBubble();
152 virtual void SelectedTabToolbarSizeChanged(bool is_animating); 152 virtual void SelectedTabToolbarSizeChanged(bool is_animating);
153 virtual void UpdateTitleBar(); 153 virtual void UpdateTitleBar();
154 virtual void ValidateThrobber(); 154 virtual void UpdateLoadingAnimations(bool should_animate);
155 virtual gfx::Rect GetNormalBounds() const; 155 virtual gfx::Rect GetNormalBounds() const;
156 virtual bool IsMaximized(); 156 virtual bool IsMaximized();
157 virtual ToolbarStarToggle* GetStarButton() const; 157 virtual ToolbarStarToggle* GetStarButton() const;
158 virtual LocationBarView* GetLocationBarView() const; 158 virtual LocationBarView* GetLocationBarView() const;
159 virtual GoButton* GetGoButton() const; 159 virtual GoButton* GetGoButton() const;
160 virtual BookmarkBarView* GetBookmarkBarView(); 160 virtual BookmarkBarView* GetBookmarkBarView();
161 virtual BrowserView* GetBrowserView() const; 161 virtual BrowserView* GetBrowserView() const;
162 virtual void UpdateToolbar(TabContents* contents, bool should_restore_state); 162 virtual void UpdateToolbar(TabContents* contents, bool should_restore_state);
163 virtual void FocusToolbar(); 163 virtual void FocusToolbar();
164 virtual void DestroyBrowser(); 164 virtual void DestroyBrowser();
(...skipping 136 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 // Copy the accelerator table from the app resources into something we can 301 // Copy the accelerator table from the app resources into something we can
302 // use. 302 // use.
303 void LoadAccelerators(); 303 void LoadAccelerators();
304 304
305 // Builds the correct menu for when we have minimal chrome. 305 // Builds the correct menu for when we have minimal chrome.
306 void BuildMenuForTabStriplessWindow(Menu* menu, int insertion_index); 306 void BuildMenuForTabStriplessWindow(Menu* menu, int insertion_index);
307 307
308 // Retrieves the command id for the specified Windows app command. 308 // Retrieves the command id for the specified Windows app command.
309 int GetCommandIDForAppCommandID(int app_command_id) const; 309 int GetCommandIDForAppCommandID(int app_command_id) const;
310 310
311 // Callback for the loading animation(s) associated with this view.
312 void LoadingAnimationCallback();
313
311 // Initialize the hung plugin detector. 314 // Initialize the hung plugin detector.
312 void InitHangMonitor(); 315 void InitHangMonitor();
313 316
314 // Initialize class statics. 317 // Initialize class statics.
315 static void InitClass(); 318 static void InitClass();
316 319
317 // The BrowserFrame that hosts this view. 320 // The BrowserFrame that hosts this view.
318 BrowserFrame* frame_; 321 BrowserFrame* frame_;
319 322
320 // The Browser object we are associated with. 323 // The Browser object we are associated with.
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
378 381
379 // This object is initialized with the frame window HWND. This 382 // This object is initialized with the frame window HWND. This
380 // object is also passed as a tick handler with the ticker_ object. 383 // object is also passed as a tick handler with the ticker_ object.
381 // It is used to periodically monitor for hung plugin windows 384 // It is used to periodically monitor for hung plugin windows
382 HungWindowDetector hung_window_detector_; 385 HungWindowDetector hung_window_detector_;
383 386
384 // This object is invoked by hung_window_detector_ when it detects a hung 387 // This object is invoked by hung_window_detector_ when it detects a hung
385 // plugin window. 388 // plugin window.
386 HungPluginAction hung_plugin_action_; 389 HungPluginAction hung_plugin_action_;
387 390
391 // The timer used to update frames for the Loading Animation.
392 base::RepeatingTimer<BrowserView> loading_animation_timer_;
393
388 // P13N stuff 394 // P13N stuff
389 #ifdef CHROME_PERSONALIZATION 395 #ifdef CHROME_PERSONALIZATION
390 FramePersonalization personalization_; 396 FramePersonalization personalization_;
391 bool personalization_enabled_; 397 bool personalization_enabled_;
392 #endif 398 #endif
393 399
394 DISALLOW_EVIL_CONSTRUCTORS(BrowserView); 400 DISALLOW_EVIL_CONSTRUCTORS(BrowserView);
395 }; 401 };
396 402
397 #endif // #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_ 403 #endif // #ifndef CHROME_BROWSER_VIEWS_FRAME_BROWSER_VIEW_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698