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

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

Issue 5606002: 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
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 45 matching lines...) Expand 10 before | Expand all | Expand 10 after
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/metrics/user_metrics.h" 60 #include "chrome/browser/metrics/user_metrics.h"
61 #include "chrome/browser/net/browser_url_util.h" 61 #include "chrome/browser/net/browser_url_util.h"
62 #include "chrome/browser/net/url_fixer_upper.h" 62 #include "chrome/browser/net/url_fixer_upper.h"
63 #include "chrome/browser/platform_util.h" 63 #include "chrome/browser/platform_util.h"
64 #include "chrome/browser/prefs/pref_service.h" 64 #include "chrome/browser/prefs/pref_service.h"
65 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h" 65 #include "chrome/browser/printing/cloud_print/cloud_print_setup_flow.h"
66 #include "chrome/browser/profile.h" 66 #include "chrome/browser/profiles/profile.h"
67 #include "chrome/browser/renderer_host/render_view_host.h" 67 #include "chrome/browser/renderer_host/render_view_host.h"
68 #include "chrome/browser/renderer_host/site_instance.h" 68 #include "chrome/browser/renderer_host/site_instance.h"
69 #include "chrome/browser/sessions/session_service.h" 69 #include "chrome/browser/sessions/session_service.h"
70 #include "chrome/browser/sessions/session_types.h" 70 #include "chrome/browser/sessions/session_types.h"
71 #include "chrome/browser/sessions/tab_restore_service.h" 71 #include "chrome/browser/sessions/tab_restore_service.h"
72 #include "chrome/browser/sync/profile_sync_service.h" 72 #include "chrome/browser/sync/profile_sync_service.h"
73 #include "chrome/browser/sync/sync_ui_util.h" 73 #include "chrome/browser/sync/sync_ui_util.h"
74 #include "chrome/browser/tab_closeable_state_watcher.h" 74 #include "chrome/browser/tab_closeable_state_watcher.h"
75 #include "chrome/browser/tab_contents/interstitial_page.h" 75 #include "chrome/browser/tab_contents/interstitial_page.h"
76 #include "chrome/browser/tab_contents/navigation_controller.h" 76 #include "chrome/browser/tab_contents/navigation_controller.h"
(...skipping 4065 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/ui/app_modal_dialogs/message_box_handler.cc ('k') | chrome/browser/ui/browser_init.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698