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

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

Issue 867323005: MacViews: Fix duplicate definition of ValidationMessageBubble::ShowAndCreate (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@FirstResponder
Patch Set: Created 5 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
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('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 47 matching lines...) Expand 10 before | Expand all | Expand 10 after
58 class BrowserWindow; 58 class BrowserWindow;
59 class FindBarController; 59 class FindBarController;
60 class FullscreenController; 60 class FullscreenController;
61 class PrefService; 61 class PrefService;
62 class Profile; 62 class Profile;
63 class SearchDelegate; 63 class SearchDelegate;
64 class SearchModel; 64 class SearchModel;
65 class StatusBubble; 65 class StatusBubble;
66 class TabStripModel; 66 class TabStripModel;
67 class TabStripModelDelegate; 67 class TabStripModelDelegate;
68 class ValidationMessageBubble;
68 struct WebApplicationInfo; 69 struct WebApplicationInfo;
69 70
70 namespace chrome { 71 namespace chrome {
71 class BrowserCommandController; 72 class BrowserCommandController;
72 class FastUnloadController; 73 class FastUnloadController;
73 class UnloadController; 74 class UnloadController;
74 class ValidationMessageBubble;
75 } 75 }
76 76
77 namespace content { 77 namespace content {
78 class NavigationController; 78 class NavigationController;
79 class PageState; 79 class PageState;
80 class SessionStorageNamespace; 80 class SessionStorageNamespace;
81 } 81 }
82 82
83 namespace extensions { 83 namespace extensions {
84 class Extension; 84 class Extension;
(...skipping 873 matching lines...) Expand 10 before | Expand all | Expand 10 after
958 958
959 scoped_ptr<extensions::WindowController> extension_window_controller_; 959 scoped_ptr<extensions::WindowController> extension_window_controller_;
960 960
961 scoped_ptr<chrome::BrowserCommandController> command_controller_; 961 scoped_ptr<chrome::BrowserCommandController> command_controller_;
962 962
963 // True if the browser window has been shown at least once. 963 // True if the browser window has been shown at least once.
964 bool window_has_shown_; 964 bool window_has_shown_;
965 965
966 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_; 966 scoped_ptr<BrowserContentTranslateDriverObserver> translate_driver_observer_;
967 967
968 scoped_ptr<chrome::ValidationMessageBubble> validation_message_bubble_; 968 scoped_ptr<ValidationMessageBubble> validation_message_bubble_;
969 969
970 // The following factory is used for chrome update coalescing. 970 // The following factory is used for chrome update coalescing.
971 base::WeakPtrFactory<Browser> chrome_updater_factory_; 971 base::WeakPtrFactory<Browser> chrome_updater_factory_;
972 972
973 // The following factory is used to close the frame at a later time. 973 // The following factory is used to close the frame at a later time.
974 base::WeakPtrFactory<Browser> weak_factory_; 974 base::WeakPtrFactory<Browser> weak_factory_;
975 975
976 DISALLOW_COPY_AND_ASSIGN(Browser); 976 DISALLOW_COPY_AND_ASSIGN(Browser);
977 }; 977 };
978 978
979 #endif // CHROME_BROWSER_UI_BROWSER_H_ 979 #endif // CHROME_BROWSER_UI_BROWSER_H_
OLDNEW
« no previous file with comments | « no previous file | chrome/browser/ui/browser.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698