OLD | NEW |
1 // Copyright (c) 2011 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 #include "chrome/browser/instant/instant_controller.h" | 5 #include "chrome/browser/instant/instant_controller.h" |
6 | 6 |
7 #include "base/command_line.h" | 7 #include "base/command_line.h" |
8 #include "base/message_loop.h" | 8 #include "base/message_loop.h" |
9 #include "base/metrics/histogram.h" | 9 #include "base/metrics/histogram.h" |
10 #include "base/rand_util.h" | 10 #include "base/rand_util.h" |
(...skipping 13 matching lines...) Expand all Loading... |
24 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" | 24 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h" |
25 #include "chrome/common/chrome_notification_types.h" | 25 #include "chrome/common/chrome_notification_types.h" |
26 #include "chrome/common/chrome_switches.h" | 26 #include "chrome/common/chrome_switches.h" |
27 #include "chrome/common/pref_names.h" | 27 #include "chrome/common/pref_names.h" |
28 #include "content/browser/renderer_host/render_widget_host_view.h" | 28 #include "content/browser/renderer_host/render_widget_host_view.h" |
29 #include "content/browser/tab_contents/tab_contents.h" | 29 #include "content/browser/tab_contents/tab_contents.h" |
30 #include "content/public/browser/notification_service.h" | 30 #include "content/public/browser/notification_service.h" |
31 | 31 |
32 #if defined(TOOLKIT_VIEWS) | 32 #if defined(TOOLKIT_VIEWS) |
33 #include "ui/views/focus/focus_manager.h" | 33 #include "ui/views/focus/focus_manager.h" |
| 34 #include "ui/views/widget/widget.h" |
34 #include "views/view.h" | 35 #include "views/view.h" |
35 #include "views/widget/widget.h" | |
36 #endif | 36 #endif |
37 | 37 |
38 InstantController::InstantController(Profile* profile, | 38 InstantController::InstantController(Profile* profile, |
39 InstantDelegate* delegate) | 39 InstantDelegate* delegate) |
40 : delegate_(delegate), | 40 : delegate_(delegate), |
41 tab_contents_(NULL), | 41 tab_contents_(NULL), |
42 is_displayable_(false), | 42 is_displayable_(false), |
43 is_out_of_date_(true), | 43 is_out_of_date_(true), |
44 commit_on_mouse_up_(false), | 44 commit_on_mouse_up_(false), |
45 last_transition_type_(content::PAGE_TRANSITION_LINK), | 45 last_transition_type_(content::PAGE_TRANSITION_LINK), |
(...skipping 507 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
553 if (destroy_factory_.empty()) { | 553 if (destroy_factory_.empty()) { |
554 MessageLoop::current()->PostTask( | 554 MessageLoop::current()->PostTask( |
555 FROM_HERE, destroy_factory_.NewRunnableMethod( | 555 FROM_HERE, destroy_factory_.NewRunnableMethod( |
556 &InstantController::DestroyLoaders)); | 556 &InstantController::DestroyLoaders)); |
557 } | 557 } |
558 } | 558 } |
559 | 559 |
560 void InstantController::DestroyLoaders() { | 560 void InstantController::DestroyLoaders() { |
561 loaders_to_destroy_.reset(); | 561 loaders_to_destroy_.reset(); |
562 } | 562 } |
OLD | NEW |