| OLD | NEW |
| 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_DIALOGS_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ |
| 6 #define CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ |
| 7 | 7 |
| 8 #include <string> | 8 #include <string> |
| 9 #include <utility> | 9 #include <utility> |
| 10 #include <vector> | 10 #include <vector> |
| (...skipping 120 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 131 gfx::NativeView parent, | 131 gfx::NativeView parent, |
| 132 bookmarks::BookmarkBubbleObserver* observer, | 132 bookmarks::BookmarkBubbleObserver* observer, |
| 133 Browser* browser, | 133 Browser* browser, |
| 134 const GURL& url, | 134 const GURL& url, |
| 135 bool newly_bookmarked); | 135 bool newly_bookmarked); |
| 136 | 136 |
| 137 // Bridging methods that show/hide the toolkit-views based Task Manager on Mac. | 137 // Bridging methods that show/hide the toolkit-views based Task Manager on Mac. |
| 138 task_management::TaskManagerTableModel* ShowTaskManagerViews(Browser* browser); | 138 task_management::TaskManagerTableModel* ShowTaskManagerViews(Browser* browser); |
| 139 void HideTaskManagerViews(); | 139 void HideTaskManagerViews(); |
| 140 | 140 |
| 141 // Notifies the old task manager with network bytes read events when the Mac | |
| 142 // views are not used. | |
| 143 bool NotifyOldTaskManagerBytesRead(const net::URLRequest& request, | |
| 144 int64_t bytes_read); | |
| 145 | |
| 146 #endif // OS_MACOSX | 141 #endif // OS_MACOSX |
| 147 | 142 |
| 148 #if defined(TOOLKIT_VIEWS) | 143 #if defined(TOOLKIT_VIEWS) |
| 149 | 144 |
| 150 // Creates a toolkit-views based LoginHandler (e.g. HTTP-Auth dialog). | 145 // Creates a toolkit-views based LoginHandler (e.g. HTTP-Auth dialog). |
| 151 LoginHandler* CreateLoginHandlerViews(net::AuthChallengeInfo* auth_info, | 146 LoginHandler* CreateLoginHandlerViews(net::AuthChallengeInfo* auth_info, |
| 152 net::URLRequest* request); | 147 net::URLRequest* request); |
| 153 | 148 |
| 154 // Shows the toolkit-views based BookmarkEditor. | 149 // Shows the toolkit-views based BookmarkEditor. |
| 155 void ShowBookmarkEditorViews(gfx::NativeWindow parent_window, | 150 void ShowBookmarkEditorViews(gfx::NativeWindow parent_window, |
| (...skipping 28 matching lines...) Expand all Loading... |
| 184 void(*)(content::NavigationHandle*, | 179 void(*)(content::NavigationHandle*, |
| 185 const std::vector<std::pair<std::basic_string<char>, gfx::Image> >&, | 180 const std::vector<std::pair<std::basic_string<char>, gfx::Image> >&, |
| 186 const base::Callback<void(size_t, | 181 const base::Callback<void(size_t, |
| 187 arc::ArcNavigationThrottle::CloseReason)>&); | 182 arc::ArcNavigationThrottle::CloseReason)>&); |
| 188 | 183 |
| 189 BubbleShowPtr ShowIntentPickerBubble(); | 184 BubbleShowPtr ShowIntentPickerBubble(); |
| 190 | 185 |
| 191 #endif // OS_CHROMEOS | 186 #endif // OS_CHROMEOS |
| 192 | 187 |
| 193 #endif // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ | 188 #endif // CHROME_BROWSER_UI_BROWSER_DIALOGS_H_ |
| OLD | NEW |