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

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

Issue 11819008: Refactors building the system menu model into a common place (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to trunk and fix windows build Created 7 years, 11 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
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_desktop_root_window_host.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 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_BROWSER_H_ 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_
6 #define CHROME_BROWSER_UI_BROWSER_H_ 6 #define CHROME_BROWSER_UI_BROWSER_H_
7 7
8 #include <map> 8 #include <map>
9 #include <set> 9 #include <set>
10 #include <string> 10 #include <string>
(...skipping 875 matching lines...) Expand 10 before | Expand all | Expand 10 after
886 // These are supplied by callers that don't want to use the default values. 886 // These are supplied by callers that don't want to use the default values.
887 // The default values are typically loaded from local state (last session), 887 // The default values are typically loaded from local state (last session),
888 // obtained from the last window of the same type, or obtained from the 888 // obtained from the last window of the same type, or obtained from the
889 // shell shortcut's startup info. 889 // shell shortcut's startup info.
890 gfx::Rect override_bounds_; 890 gfx::Rect override_bounds_;
891 ui::WindowShowState initial_show_state_; 891 ui::WindowShowState initial_show_state_;
892 892
893 // Tracks when this browser is being created by session restore. 893 // Tracks when this browser is being created by session restore.
894 bool is_session_restore_; 894 bool is_session_restore_;
895 895
896 chrome::HostDesktopType host_desktop_type_; 896 const chrome::HostDesktopType host_desktop_type_;
897 897
898 scoped_ptr<chrome::UnloadController> unload_controller_; 898 scoped_ptr<chrome::UnloadController> unload_controller_;
899 899
900 // The following factory is used to close the frame at a later time. 900 // The following factory is used to close the frame at a later time.
901 base::WeakPtrFactory<Browser> weak_factory_; 901 base::WeakPtrFactory<Browser> weak_factory_;
902 902
903 // The Find Bar. This may be NULL if there is no Find Bar, and if it is 903 // The Find Bar. This may be NULL if there is no Find Bar, and if it is
904 // non-NULL, it may or may not be visible. 904 // non-NULL, it may or may not be visible.
905 scoped_ptr<FindBarController> find_bar_controller_; 905 scoped_ptr<FindBarController> find_bar_controller_;
906 906
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
946 bool window_has_shown_; 946 bool window_has_shown_;
947 947
948 // Currently open color chooser. Non-NULL after OpenColorChooser is called and 948 // Currently open color chooser. Non-NULL after OpenColorChooser is called and
949 // before DidEndColorChooser is called. 949 // before DidEndColorChooser is called.
950 scoped_ptr<content::ColorChooser> color_chooser_; 950 scoped_ptr<content::ColorChooser> color_chooser_;
951 951
952 DISALLOW_COPY_AND_ASSIGN(Browser); 952 DISALLOW_COPY_AND_ASSIGN(Browser);
953 }; 953 };
954 954
955 #endif // CHROME_BROWSER_UI_BROWSER_H_ 955 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/views/frame/browser_desktop_root_window_host.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698