| 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 414 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 425 bool user_gesture); | 425 bool user_gesture); |
| 426 | 426 |
| 427 // Helper function to handle find results. | 427 // Helper function to handle find results. |
| 428 static void FindReplyHelper(content::WebContents* web_contents, | 428 static void FindReplyHelper(content::WebContents* web_contents, |
| 429 int request_id, | 429 int request_id, |
| 430 int number_of_matches, | 430 int number_of_matches, |
| 431 const gfx::Rect& selection_rect, | 431 const gfx::Rect& selection_rect, |
| 432 int active_match_ordinal, | 432 int active_match_ordinal, |
| 433 bool final_update); | 433 bool final_update); |
| 434 | 434 |
| 435 // Called by browser::Navigate() when a navigation has occurred in a tab in | 435 // Called by chrome::Navigate() when a navigation has occurred in a tab in |
| 436 // this Browser. Updates the UI for the start of this navigation. | 436 // this Browser. Updates the UI for the start of this navigation. |
| 437 void UpdateUIForNavigationInTab(TabContents* contents, | 437 void UpdateUIForNavigationInTab(TabContents* contents, |
| 438 content::PageTransition transition, | 438 content::PageTransition transition, |
| 439 bool user_initiated); | 439 bool user_initiated); |
| 440 | 440 |
| 441 // Interface implementations //////////////////////////////////////////////// | 441 // Interface implementations //////////////////////////////////////////////// |
| 442 | 442 |
| 443 // Overridden from content::PageNavigator: | 443 // Overridden from content::PageNavigator: |
| 444 virtual content::WebContents* OpenURL( | 444 virtual content::WebContents* OpenURL( |
| 445 const content::OpenURLParams& params) OVERRIDE; | 445 const content::OpenURLParams& params) OVERRIDE; |
| (...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1048 bool window_has_shown_; | 1048 bool window_has_shown_; |
| 1049 | 1049 |
| 1050 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 1050 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 1051 // before DidEndColorChooser is called. | 1051 // before DidEndColorChooser is called. |
| 1052 scoped_ptr<content::ColorChooser> color_chooser_; | 1052 scoped_ptr<content::ColorChooser> color_chooser_; |
| 1053 | 1053 |
| 1054 DISALLOW_COPY_AND_ASSIGN(Browser); | 1054 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 1055 }; | 1055 }; |
| 1056 | 1056 |
| 1057 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 1057 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |