| 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 | 7 |
| 8 #include <map> | 8 #include <map> |
| 9 #include <set> | 9 #include <set> |
| 10 #include <string> | 10 #include <string> |
| (...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 518 BOOKMARK_BAR_STATE_CHANGE_TAB_SWITCH, | 518 BOOKMARK_BAR_STATE_CHANGE_TAB_SWITCH, |
| 519 | 519 |
| 520 // Change is the result of the bookmark bar pref changing. | 520 // Change is the result of the bookmark bar pref changing. |
| 521 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE, | 521 BOOKMARK_BAR_STATE_CHANGE_PREF_CHANGE, |
| 522 | 522 |
| 523 // Change is the result of a state change in the active tab. | 523 // Change is the result of a state change in the active tab. |
| 524 BOOKMARK_BAR_STATE_CHANGE_TAB_STATE, | 524 BOOKMARK_BAR_STATE_CHANGE_TAB_STATE, |
| 525 | 525 |
| 526 // Change is the result of window toggling in/out of fullscreen mode. | 526 // Change is the result of window toggling in/out of fullscreen mode. |
| 527 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, | 527 BOOKMARK_BAR_STATE_CHANGE_TOGGLE_FULLSCREEN, |
| 528 | |
| 529 // Change is the result of a state change in the instant preview. | |
| 530 BOOKMARK_BAR_STATE_CHANGE_INSTANT_PREVIEW_STATE, | |
| 531 }; | 528 }; |
| 532 | 529 |
| 533 // Overridden from content::WebContentsDelegate: | 530 // Overridden from content::WebContentsDelegate: |
| 534 virtual content::WebContents* OpenURLFromTab( | 531 virtual content::WebContents* OpenURLFromTab( |
| 535 content::WebContents* source, | 532 content::WebContents* source, |
| 536 const content::OpenURLParams& params) OVERRIDE; | 533 const content::OpenURLParams& params) OVERRIDE; |
| 537 virtual void NavigationStateChanged(const content::WebContents* source, | 534 virtual void NavigationStateChanged(const content::WebContents* source, |
| 538 unsigned changed_flags) OVERRIDE; | 535 unsigned changed_flags) OVERRIDE; |
| 539 virtual void AddNewContents(content::WebContents* source, | 536 virtual void AddNewContents(content::WebContents* source, |
| 540 content::WebContents* new_contents, | 537 content::WebContents* new_contents, |
| (...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 936 bool window_has_shown_; | 933 bool window_has_shown_; |
| 937 | 934 |
| 938 // Currently open color chooser. Non-NULL after OpenColorChooser is called and | 935 // Currently open color chooser. Non-NULL after OpenColorChooser is called and |
| 939 // before DidEndColorChooser is called. | 936 // before DidEndColorChooser is called. |
| 940 scoped_ptr<content::ColorChooser> color_chooser_; | 937 scoped_ptr<content::ColorChooser> color_chooser_; |
| 941 | 938 |
| 942 DISALLOW_COPY_AND_ASSIGN(Browser); | 939 DISALLOW_COPY_AND_ASSIGN(Browser); |
| 943 }; | 940 }; |
| 944 | 941 |
| 945 #endif // CHROME_BROWSER_UI_BROWSER_H_ | 942 #endif // CHROME_BROWSER_UI_BROWSER_H_ |
| OLD | NEW |