OLD | NEW |
---|---|
1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 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_SEARCH_INSTANT_CONTROLLER_H_ | 5 #ifndef CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 6 #define CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
7 | 7 |
8 #include <list> | 8 #include <list> |
9 #include <string> | 9 #include <string> |
10 #include <utility> | 10 #include <utility> |
(...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
470 // See comments on the getter above. | 470 // See comments on the getter above. |
471 content::PageTransition last_transition_type_; | 471 content::PageTransition last_transition_type_; |
472 | 472 |
473 // True if the last match passed to Update() was a search (versus a URL). | 473 // True if the last match passed to Update() was a search (versus a URL). |
474 // Used to ensure that the overlay page is committable. | 474 // Used to ensure that the overlay page is committable. |
475 bool last_match_was_search_; | 475 bool last_match_was_search_; |
476 | 476 |
477 // Omnibox focus state. | 477 // Omnibox focus state. |
478 OmniboxFocusState omnibox_focus_state_; | 478 OmniboxFocusState omnibox_focus_state_; |
479 | 479 |
480 // The reason for the most recent omnibox focus change. | |
481 OmniboxFocusChangeReason reason_; | |
samarth
2013/05/15 19:05:53
s/reason_/omnibox_focus_change_reason_/
Donn Denman
2013/05/20 23:48:14
Done.
| |
482 | |
480 // The search model mode for the active tab. | 483 // The search model mode for the active tab. |
481 SearchMode search_mode_; | 484 SearchMode search_mode_; |
482 | 485 |
483 // Current omnibox popup bounds. | 486 // Current omnibox popup bounds. |
484 gfx::Rect popup_bounds_; | 487 gfx::Rect popup_bounds_; |
485 | 488 |
486 // Last popup bounds passed to the page. | 489 // Last popup bounds passed to the page. |
487 gfx::Rect last_popup_bounds_; | 490 gfx::Rect last_popup_bounds_; |
488 | 491 |
489 // The start-edge margin and width of the omnibox, used by the page to align | 492 // The start-edge margin and width of the omnibox, used by the page to align |
(...skipping 25 matching lines...) Expand all Loading... | |
515 // Used for Top Sites async retrieval. | 518 // Used for Top Sites async retrieval. |
516 base::WeakPtrFactory<InstantController> weak_ptr_factory_; | 519 base::WeakPtrFactory<InstantController> weak_ptr_factory_; |
517 | 520 |
518 // Used to get notifications about Most Visted changes. | 521 // Used to get notifications about Most Visted changes. |
519 content::NotificationRegistrar registrar_; | 522 content::NotificationRegistrar registrar_; |
520 | 523 |
521 DISALLOW_COPY_AND_ASSIGN(InstantController); | 524 DISALLOW_COPY_AND_ASSIGN(InstantController); |
522 }; | 525 }; |
523 | 526 |
524 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ | 527 #endif // CHROME_BROWSER_UI_SEARCH_INSTANT_CONTROLLER_H_ |
OLD | NEW |