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_H_ | 5 #ifndef CHROME_BROWSER_UI_BROWSER_H_ |
6 #define CHROME_BROWSER_UI_BROWSER_H_ | 6 #define CHROME_BROWSER_UI_BROWSER_H_ |
7 #pragma once | 7 #pragma once |
8 | 8 |
9 #include <map> | 9 #include <map> |
10 #include <set> | 10 #include <set> |
(...skipping 1018 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1029 const NativeWebKeyboardEvent& event) OVERRIDE; | 1029 const NativeWebKeyboardEvent& event) OVERRIDE; |
1030 virtual void ShowRepostFormWarningDialog( | 1030 virtual void ShowRepostFormWarningDialog( |
1031 content::WebContents* source) OVERRIDE; | 1031 content::WebContents* source) OVERRIDE; |
1032 virtual bool ShouldAddNavigationToHistory( | 1032 virtual bool ShouldAddNavigationToHistory( |
1033 const history::HistoryAddPageArgs& add_page_args, | 1033 const history::HistoryAddPageArgs& add_page_args, |
1034 content::NavigationType navigation_type) OVERRIDE; | 1034 content::NavigationType navigation_type) OVERRIDE; |
1035 virtual bool ShouldCreateWebContents( | 1035 virtual bool ShouldCreateWebContents( |
1036 content::WebContents* web_contents, | 1036 content::WebContents* web_contents, |
1037 int route_id, | 1037 int route_id, |
1038 WindowContainerType window_container_type, | 1038 WindowContainerType window_container_type, |
1039 const string16& frame_name) OVERRIDE; | 1039 const string16& frame_name, |
| 1040 const GURL& target_url) OVERRIDE; |
1040 virtual void WebContentsCreated(content::WebContents* source_contents, | 1041 virtual void WebContentsCreated(content::WebContents* source_contents, |
1041 int64 source_frame_id, | 1042 int64 source_frame_id, |
1042 const GURL& target_url, | 1043 const GURL& target_url, |
1043 content::WebContents* new_contents) OVERRIDE; | 1044 content::WebContents* new_contents) OVERRIDE; |
1044 virtual void ContentRestrictionsChanged( | 1045 virtual void ContentRestrictionsChanged( |
1045 content::WebContents* source) OVERRIDE; | 1046 content::WebContents* source) OVERRIDE; |
1046 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; | 1047 virtual void RendererUnresponsive(content::WebContents* source) OVERRIDE; |
1047 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; | 1048 virtual void RendererResponsive(content::WebContents* source) OVERRIDE; |
1048 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; | 1049 virtual void WorkerCrashed(content::WebContents* source) OVERRIDE; |
1049 virtual void DidNavigateMainFramePostCommit( | 1050 virtual void DidNavigateMainFramePostCommit( |
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1349 // Resets |bookmark_bar_state_| based on the active tab. Notifies the | 1350 // Resets |bookmark_bar_state_| based on the active tab. Notifies the |
1350 // BrowserWindow if necessary. | 1351 // BrowserWindow if necessary. |
1351 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); | 1352 void UpdateBookmarkBarState(BookmarkBarStateChangeReason reason); |
1352 | 1353 |
1353 // Open the bookmark manager with a defined hash action. | 1354 // Open the bookmark manager with a defined hash action. |
1354 void OpenBookmarkManagerWithHash(const std::string& action, int64 node_id); | 1355 void OpenBookmarkManagerWithHash(const std::string& action, int64 node_id); |
1355 | 1356 |
1356 // Creates a BackgroundContents if appropriate; return true if one was | 1357 // Creates a BackgroundContents if appropriate; return true if one was |
1357 // created. | 1358 // created. |
1358 bool MaybeCreateBackgroundContents(int route_id, | 1359 bool MaybeCreateBackgroundContents(int route_id, |
1359 content::SiteInstance* site, | 1360 content::WebContents* opener_web_contents, |
1360 const GURL& opener_url, | 1361 const string16& frame_name, |
1361 const string16& frame_name); | 1362 const GURL& target_url); |
1362 | 1363 |
1363 // Data members ///////////////////////////////////////////////////////////// | 1364 // Data members ///////////////////////////////////////////////////////////// |
1364 | 1365 |
1365 content::NotificationRegistrar registrar_; | 1366 content::NotificationRegistrar registrar_; |
1366 | 1367 |
1367 PrefChangeRegistrar profile_pref_registrar_; | 1368 PrefChangeRegistrar profile_pref_registrar_; |
1368 | 1369 |
1369 PrefChangeRegistrar local_pref_registrar_; | 1370 PrefChangeRegistrar local_pref_registrar_; |
1370 | 1371 |
1371 // This Browser's type. | 1372 // This Browser's type. |
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
1518 bool window_has_shown_; | 1519 bool window_has_shown_; |
1519 | 1520 |
1520 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1521 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
1521 // before DidEndColorChooser is called. | 1522 // before DidEndColorChooser is called. |
1522 scoped_ptr<content::ColorChooser> color_chooser_; | 1523 scoped_ptr<content::ColorChooser> color_chooser_; |
1523 | 1524 |
1524 DISALLOW_COPY_AND_ASSIGN(Browser); | 1525 DISALLOW_COPY_AND_ASSIGN(Browser); |
1525 }; | 1526 }; |
1526 | 1527 |
1527 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1528 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
OLD | NEW |