| OLD | NEW |
| 1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| 7 #pragma once | 7 #pragma once |
| 8 | 8 |
| 9 #include <string> | 9 #include <string> |
| 10 #include <vector> | 10 #include <vector> |
| 11 | 11 |
| 12 #include "base/task.h" | 12 #include "base/task.h" |
| 13 #include "chrome/browser/autocomplete/autocomplete_edit.h" | 13 #include "chrome/browser/autocomplete/autocomplete_edit.h" |
| 14 #include "chrome/browser/extensions/extension_context_menu_model.h" | 14 #include "chrome/browser/extensions/extension_context_menu_model.h" |
| 15 #include "chrome/browser/first_run/first_run.h" | 15 #include "chrome/browser/first_run/first_run.h" |
| 16 #include "chrome/browser/search_engines/template_url_model_observer.h" | 16 #include "chrome/browser/search_engines/template_url_model_observer.h" |
| 17 #include "chrome/browser/ui/omnibox/location_bar.h" | 17 #include "chrome/browser/ui/omnibox/location_bar.h" |
| 18 #include "chrome/browser/ui/toolbar/toolbar_model.h" | 18 #include "chrome/browser/ui/toolbar/toolbar_model.h" |
| 19 #include "chrome/browser/views/extensions/extension_popup.h" | 19 #include "chrome/browser/ui/views/extensions/extension_popup.h" |
| 20 #include "chrome/common/notification_observer.h" | 20 #include "chrome/common/notification_observer.h" |
| 21 #include "chrome/common/notification_registrar.h" | 21 #include "chrome/common/notification_registrar.h" |
| 22 #include "gfx/font.h" | 22 #include "gfx/font.h" |
| 23 #include "gfx/rect.h" | 23 #include "gfx/rect.h" |
| 24 #include "views/controls/native/native_view_host.h" | 24 #include "views/controls/native/native_view_host.h" |
| 25 | 25 |
| 26 #if defined(OS_WIN) | 26 #if defined(OS_WIN) |
| 27 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" | 27 #include "chrome/browser/autocomplete/autocomplete_edit_view_win.h" |
| 28 #elif defined(OS_LINUX) | 28 #elif defined(OS_LINUX) |
| 29 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h" | 29 #include "chrome/browser/autocomplete/autocomplete_edit_view_gtk.h" |
| (...skipping 381 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 411 // Should instant be updated? This is set to false in OnAutocompleteWillAccept | 411 // Should instant be updated? This is set to false in OnAutocompleteWillAccept |
| 412 // and true in OnAutocompleteAccept. This is needed as prior to accepting an | 412 // and true in OnAutocompleteAccept. This is needed as prior to accepting an |
| 413 // autocomplete suggestion the model is reverted which triggers resetting | 413 // autocomplete suggestion the model is reverted which triggers resetting |
| 414 // instant. | 414 // instant. |
| 415 bool update_instant_; | 415 bool update_instant_; |
| 416 | 416 |
| 417 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); | 417 DISALLOW_IMPLICIT_CONSTRUCTORS(LocationBarView); |
| 418 }; | 418 }; |
| 419 | 419 |
| 420 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 420 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |