Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(38)

Issues Search
    My Issues | Starred     Open | Closed | All

Side by Side Diff: chrome/browser/ui/browser.cc

Issue 5582002: Move:... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 10 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/tabs/tab_strip_model_unittest.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2010 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2010 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/ui/browser.h" 5 #include "chrome/browser/ui/browser.h"
6 6
7 #if defined(OS_WIN) 7 #if defined(OS_WIN)
8 #include <shellapi.h> 8 #include <shellapi.h>
9 #include <windows.h> 9 #include <windows.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 39 matching lines...) Expand 10 before | Expand all | Expand 10 after
50 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h" 50 #include "chrome/browser/extensions/extension_disabled_infobar_delegate.h"
51 #include "chrome/browser/extensions/extension_host.h" 51 #include "chrome/browser/extensions/extension_host.h"
52 #include "chrome/browser/extensions/extension_prefs.h" 52 #include "chrome/browser/extensions/extension_prefs.h"
53 #include "chrome/browser/extensions/extension_tabs_module.h" 53 #include "chrome/browser/extensions/extension_tabs_module.h"
54 #include "chrome/browser/extensions/extensions_service.h" 54 #include "chrome/browser/extensions/extensions_service.h"
55 #include "chrome/browser/first_run/first_run.h" 55 #include "chrome/browser/first_run/first_run.h"
56 #include "chrome/browser/google/google_url_tracker.h" 56 #include "chrome/browser/google/google_url_tracker.h"
57 #include "chrome/browser/google/google_util.h" 57 #include "chrome/browser/google/google_util.h"
58 #include "chrome/browser/host_zoom_map.h" 58 #include "chrome/browser/host_zoom_map.h"
59 #include "chrome/browser/instant/instant_controller.h" 59 #include "chrome/browser/instant/instant_controller.h"
60 #include "chrome/browser/location_bar.h"
61 #include "chrome/browser/metrics/user_metrics.h" 60 #include "chrome/browser/metrics/user_metrics.h"
62 #include "chrome/browser/net/browser_url_util.h" 61 #include "chrome/browser/net/browser_url_util.h"
63 #include "chrome/browser/net/url_fixer_upper.h" 62 #include "chrome/browser/net/url_fixer_upper.h"
64 #include "chrome/browser/options_window.h"
65 #include "chrome/browser/platform_util.h" 63 #include "chrome/browser/platform_util.h"
66 #include "chrome/browser/prefs/pref_service.h" 64 #include "chrome/browser/prefs/pref_service.h"
67 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 65 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
68 #include "chrome/browser/profile.h" 66 #include "chrome/browser/profile.h"
69 #include "chrome/browser/renderer_host/render_view_host.h" 67 #include "chrome/browser/renderer_host/render_view_host.h"
70 #include "chrome/browser/renderer_host/site_instance.h" 68 #include "chrome/browser/renderer_host/site_instance.h"
71 #include "chrome/browser/sessions/session_service.h" 69 #include "chrome/browser/sessions/session_service.h"
72 #include "chrome/browser/sessions/session_types.h" 70 #include "chrome/browser/sessions/session_types.h"
73 #include "chrome/browser/sessions/tab_restore_service.h" 71 #include "chrome/browser/sessions/tab_restore_service.h"
74 #include "chrome/browser/status_bubble.h"
75 #include "chrome/browser/sync/profile_sync_service.h" 72 #include "chrome/browser/sync/profile_sync_service.h"
76 #include "chrome/browser/sync/sync_ui_util.h" 73 #include "chrome/browser/sync/sync_ui_util.h"
77 #include "chrome/browser/tab_closeable_state_watcher.h" 74 #include "chrome/browser/tab_closeable_state_watcher.h"
78 #include "chrome/browser/tab_contents/interstitial_page.h" 75 #include "chrome/browser/tab_contents/interstitial_page.h"
79 #include "chrome/browser/tab_contents/navigation_controller.h" 76 #include "chrome/browser/tab_contents/navigation_controller.h"
80 #include "chrome/browser/tab_contents/navigation_entry.h" 77 #include "chrome/browser/tab_contents/navigation_entry.h"
81 #include "chrome/browser/tab_contents/tab_contents.h" 78 #include "chrome/browser/tab_contents/tab_contents.h"
82 #include "chrome/browser/tab_contents/tab_contents_view.h" 79 #include "chrome/browser/tab_contents/tab_contents_view.h"
83 #include "chrome/browser/tab_contents_wrapper.h"
84 #include "chrome/browser/tab_menu_model.h"
85 #include "chrome/browser/tabs/tab_strip_model.h" 80 #include "chrome/browser/tabs/tab_strip_model.h"
86 #include "chrome/browser/ui/browser_navigator.h" 81 #include "chrome/browser/ui/browser_navigator.h"
87 #include "chrome/browser/ui/find_bar/find_bar.h" 82 #include "chrome/browser/ui/find_bar/find_bar.h"
88 #include "chrome/browser/ui/find_bar/find_bar_controller.h" 83 #include "chrome/browser/ui/find_bar/find_bar_controller.h"
84 #include "chrome/browser/ui/omnibox/location_bar.h"
85 #include "chrome/browser/ui/options/options_window.h"
86 #include "chrome/browser/ui/status_bubble.h"
87 #include "chrome/browser/ui/tab_contents/tab_contents_wrapper.h"
89 #include "chrome/browser/ui/tabs/dock_info.h" 88 #include "chrome/browser/ui/tabs/dock_info.h"
89 #include "chrome/browser/ui/tabs/tab_menu_model.h"
90 #include "chrome/browser/ui/window_sizer.h" 90 #include "chrome/browser/ui/window_sizer.h"
91 #include "chrome/browser/upgrade_detector.h" 91 #include "chrome/browser/upgrade_detector.h"
92 #include "chrome/browser/web_applications/web_app.h" 92 #include "chrome/browser/web_applications/web_app.h"
93 #include "chrome/common/chrome_constants.h" 93 #include "chrome/common/chrome_constants.h"
94 #include "chrome/common/chrome_switches.h" 94 #include "chrome/common/chrome_switches.h"
95 #include "chrome/common/content_restriction.h" 95 #include "chrome/common/content_restriction.h"
96 #include "chrome/common/extensions/extension.h" 96 #include "chrome/common/extensions/extension.h"
97 #include "chrome/common/notification_service.h" 97 #include "chrome/common/notification_service.h"
98 #include "chrome/common/page_transition_types.h" 98 #include "chrome/common/page_transition_types.h"
99 #include "chrome/common/pref_names.h" 99 #include "chrome/common/pref_names.h"
(...skipping 15 matching lines...) Expand all
115 115
116 #if defined(OS_WIN) 116 #if defined(OS_WIN)
117 #include "app/win_util.h" 117 #include "app/win_util.h"
118 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" 118 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
119 #include "chrome/browser/browser_child_process_host.h" 119 #include "chrome/browser/browser_child_process_host.h"
120 #include "chrome/browser/cert_store.h" 120 #include "chrome/browser/cert_store.h"
121 #include "chrome/browser/download/save_package.h" 121 #include "chrome/browser/download/save_package.h"
122 #include "chrome/browser/ssl/ssl_error_info.h" 122 #include "chrome/browser/ssl/ssl_error_info.h"
123 #include "chrome/browser/shell_integration.h" 123 #include "chrome/browser/shell_integration.h"
124 #include "chrome/browser/task_manager/task_manager.h" 124 #include "chrome/browser/task_manager/task_manager.h"
125 #include "chrome/browser/view_ids.h" 125 #include "chrome/browser/ui/view_ids.h"
126 #include "chrome/browser/views/location_bar/location_bar_view.h" 126 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
127 #endif // OS_WIN 127 #endif // OS_WIN
128 128
129 #if defined(OS_MACOSX) 129 #if defined(OS_MACOSX)
130 #include "chrome/browser/ui/cocoa/find_pasteboard.h" 130 #include "chrome/browser/ui/cocoa/find_pasteboard.h"
131 #endif 131 #endif
132 132
133 #if defined(OS_CHROMEOS) 133 #if defined(OS_CHROMEOS)
134 #include <gdk/gdk.h> // For GdkScreen 134 #include <gdk/gdk.h> // For GdkScreen
135 #include "chrome/browser/chromeos/boot_times_loader.h" 135 #include "chrome/browser/chromeos/boot_times_loader.h"
136 #include "chrome/browser/chromeos/cros/cros_library.h" 136 #include "chrome/browser/chromeos/cros/cros_library.h"
(...skipping 4005 matching lines...) Expand 10 before | Expand all | Expand 10 after
4142 NOTREACHED(); 4142 NOTREACHED();
4143 return false; 4143 return false;
4144 } 4144 }
4145 4145
4146 void Browser::CreateInstantIfNecessary() { 4146 void Browser::CreateInstantIfNecessary() {
4147 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) && 4147 if (type() == TYPE_NORMAL && InstantController::IsEnabled(profile()) &&
4148 !profile()->IsOffTheRecord()) { 4148 !profile()->IsOffTheRecord()) {
4149 instant_.reset(new InstantController(profile_, this)); 4149 instant_.reset(new InstantController(profile_, this));
4150 } 4150 }
4151 } 4151 }
OLDNEW
« no previous file with comments | « chrome/browser/tabs/tab_strip_model_unittest.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698