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

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

Issue 594063: Plumb shift-reload down into newly-added shift-reload API. (Closed)
Patch Set: 80 Created 10 years, 10 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
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_BROWSER_H_
6 #define CHROME_BROWSER_BROWSER_H_ 6 #define CHROME_BROWSER_BROWSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <vector> 10 #include <vector>
(...skipping 332 matching lines...) Expand 10 before | Expand all | Expand 10 after
343 343
344 // Assorted browser commands //////////////////////////////////////////////// 344 // Assorted browser commands ////////////////////////////////////////////////
345 345
346 // NOTE: Within each of the following sections, the IDs are ordered roughly by 346 // NOTE: Within each of the following sections, the IDs are ordered roughly by
347 // how they appear in the GUI/menus (left to right, top to bottom, etc.). 347 // how they appear in the GUI/menus (left to right, top to bottom, etc.).
348 348
349 // Navigation commands 349 // Navigation commands
350 void GoBack(WindowOpenDisposition disposition); 350 void GoBack(WindowOpenDisposition disposition);
351 void GoForward(WindowOpenDisposition disposition); 351 void GoForward(WindowOpenDisposition disposition);
352 void Reload(); 352 void Reload();
353 void ReloadIgnoringCache(); // AKA shift-reload.
353 void Home(WindowOpenDisposition disposition); 354 void Home(WindowOpenDisposition disposition);
354 void OpenCurrentURL(); 355 void OpenCurrentURL();
355 void Go(WindowOpenDisposition disposition); 356 void Go(WindowOpenDisposition disposition);
356 void Stop(); 357 void Stop();
357 // Window management commands 358 // Window management commands
358 void NewWindow(); 359 void NewWindow();
359 void NewIncognitoWindow(); 360 void NewIncognitoWindow();
360 void NewProfileWindowByIndex(int index); 361 void NewProfileWindowByIndex(int index);
361 void CloseWindow(); 362 void CloseWindow();
362 void NewTab(); 363 void NewTab();
(...skipping 403 matching lines...) Expand 10 before | Expand all | Expand 10 after
766 767
767 // Create a preference dictionary for the provided application name. This is 768 // Create a preference dictionary for the provided application name. This is
768 // done only once per application name / per session. 769 // done only once per application name / per session.
769 static void RegisterAppPrefs(const std::wstring& app_name); 770 static void RegisterAppPrefs(const std::wstring& app_name);
770 771
771 // If |app_extension_id| is not empty this sets the application extension of 772 // If |app_extension_id| is not empty this sets the application extension of
772 // |contents| to the extension whose id is |app_extension_id|. 773 // |contents| to the extension whose id is |app_extension_id|.
773 void SetAppExtensionById(TabContents* contents, 774 void SetAppExtensionById(TabContents* contents,
774 const std::string& app_extension_id); 775 const std::string& app_extension_id);
775 776
777 // Shared code between Reload() and ReloadAll().
778 void ReloadInternal(bool ignore_cache);
779
776 // Data members ///////////////////////////////////////////////////////////// 780 // Data members /////////////////////////////////////////////////////////////
777 781
778 NotificationRegistrar registrar_; 782 NotificationRegistrar registrar_;
779 783
780 // This Browser's type. 784 // This Browser's type.
781 const Type type_; 785 const Type type_;
782 786
783 // This Browser's profile. 787 // This Browser's profile.
784 Profile* const profile_; 788 Profile* const profile_;
785 789
(...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after
888 }; 892 };
889 893
890 // Which deferred action to perform when OnDidGetApplicationInfo is notified 894 // Which deferred action to perform when OnDidGetApplicationInfo is notified
891 // from a TabContents. Currently, only one pending action is allowed. 895 // from a TabContents. Currently, only one pending action is allowed.
892 WebAppAction pending_web_app_action_; 896 WebAppAction pending_web_app_action_;
893 897
894 DISALLOW_COPY_AND_ASSIGN(Browser); 898 DISALLOW_COPY_AND_ASSIGN(Browser);
895 }; 899 };
896 900
897 #endif // CHROME_BROWSER_BROWSER_H_ 901 #endif // CHROME_BROWSER_BROWSER_H_
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698