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

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

Issue 6657003: Update a bunch of files to the new location of notification files. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase Created 9 years, 9 months 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/ui/browser.h ('k') | chrome/browser/ui/browser_list.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) 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/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
11 11
12 #include <algorithm> 12 #include <algorithm>
13 #include <string> 13 #include <string>
14 14
15 #include "base/base_paths.h" 15 #include "base/base_paths.h"
16 #include "base/command_line.h" 16 #include "base/command_line.h"
17 #include "base/logging.h" 17 #include "base/logging.h"
18 #include "base/metrics/histogram.h" 18 #include "base/metrics/histogram.h"
19 #include "base/path_service.h" 19 #include "base/path_service.h"
20 #include "base/string_util.h" 20 #include "base/string_util.h"
21 #include "base/time.h"
22 #include "base/threading/thread.h" 21 #include "base/threading/thread.h"
23 #include "base/threading/thread_restrictions.h" 22 #include "base/threading/thread_restrictions.h"
23 #include "base/time.h"
24 #include "base/utf_string_conversions.h" 24 #include "base/utf_string_conversions.h"
25 #include "chrome/app/chrome_command_ids.h" 25 #include "chrome/app/chrome_command_ids.h"
26 #include "chrome/browser/autofill/autofill_manager.h" 26 #include "chrome/browser/autofill/autofill_manager.h"
27 #include "chrome/browser/bookmarks/bookmark_model.h" 27 #include "chrome/browser/bookmarks/bookmark_model.h"
28 #include "chrome/browser/bookmarks/bookmark_utils.h" 28 #include "chrome/browser/bookmarks/bookmark_utils.h"
29 #include "chrome/browser/browser_list.h" 29 #include "chrome/browser/browser_list.h"
30 #include "chrome/browser/browser_process.h" 30 #include "chrome/browser/browser_process.h"
31 #include "chrome/browser/browser_shutdown.h" 31 #include "chrome/browser/browser_shutdown.h"
32 #include "chrome/browser/browser_url_handler.h" 32 #include "chrome/browser/browser_url_handler.h"
33 #include "chrome/browser/browser_window.h" 33 #include "chrome/browser/browser_window.h"
(...skipping 49 matching lines...) Expand 10 before | Expand all | Expand 10 after
83 #include "chrome/browser/ui/webui/filebrowse_ui.h" 83 #include "chrome/browser/ui/webui/filebrowse_ui.h"
84 #include "chrome/browser/ui/webui/options/content_settings_handler.h" 84 #include "chrome/browser/ui/webui/options/content_settings_handler.h"
85 #include "chrome/browser/ui/window_sizer.h" 85 #include "chrome/browser/ui/window_sizer.h"
86 #include "chrome/browser/upgrade_detector.h" 86 #include "chrome/browser/upgrade_detector.h"
87 #include "chrome/browser/web_applications/web_app.h" 87 #include "chrome/browser/web_applications/web_app.h"
88 #include "chrome/common/chrome_constants.h" 88 #include "chrome/common/chrome_constants.h"
89 #include "chrome/common/chrome_switches.h" 89 #include "chrome/common/chrome_switches.h"
90 #include "chrome/common/content_restriction.h" 90 #include "chrome/common/content_restriction.h"
91 #include "chrome/common/extensions/extension.h" 91 #include "chrome/common/extensions/extension.h"
92 #include "chrome/common/extensions/extension_constants.h" 92 #include "chrome/common/extensions/extension_constants.h"
93 #include "chrome/common/notification_service.h"
94 #include "chrome/common/page_transition_types.h" 93 #include "chrome/common/page_transition_types.h"
95 #include "chrome/common/pref_names.h" 94 #include "chrome/common/pref_names.h"
96 #include "chrome/common/profiling.h" 95 #include "chrome/common/profiling.h"
97 #include "chrome/common/url_constants.h" 96 #include "chrome/common/url_constants.h"
98 #include "chrome/common/web_apps.h" 97 #include "chrome/common/web_apps.h"
99 #include "content/browser/host_zoom_map.h" 98 #include "content/browser/host_zoom_map.h"
100 #include "content/browser/renderer_host/render_view_host.h" 99 #include "content/browser/renderer_host/render_view_host.h"
101 #include "content/browser/site_instance.h" 100 #include "content/browser/site_instance.h"
102 #include "content/browser/tab_contents/interstitial_page.h" 101 #include "content/browser/tab_contents/interstitial_page.h"
103 #include "content/browser/tab_contents/navigation_controller.h" 102 #include "content/browser/tab_contents/navigation_controller.h"
104 #include "content/browser/tab_contents/navigation_entry.h" 103 #include "content/browser/tab_contents/navigation_entry.h"
105 #include "content/browser/tab_contents/tab_contents.h" 104 #include "content/browser/tab_contents/tab_contents.h"
106 #include "content/browser/tab_contents/tab_contents_view.h" 105 #include "content/browser/tab_contents/tab_contents_view.h"
106 #include "content/common/notification_service.h"
107 #include "grit/chromium_strings.h" 107 #include "grit/chromium_strings.h"
108 #include "grit/generated_resources.h" 108 #include "grit/generated_resources.h"
109 #include "grit/locale_settings.h" 109 #include "grit/locale_settings.h"
110 #include "net/base/cookie_monster.h" 110 #include "net/base/cookie_monster.h"
111 #include "net/base/net_util.h" 111 #include "net/base/net_util.h"
112 #include "net/base/registry_controlled_domain.h" 112 #include "net/base/registry_controlled_domain.h"
113 #include "net/base/static_cookie_policy.h" 113 #include "net/base/static_cookie_policy.h"
114 #include "net/url_request/url_request_context.h" 114 #include "net/url_request/url_request_context.h"
115 #include "ui/base/animation/animation.h" 115 #include "ui/base/animation/animation.h"
116 #include "ui/base/l10n/l10n_util.h" 116 #include "ui/base/l10n/l10n_util.h"
(...skipping 4270 matching lines...) Expand 10 before | Expand all | Expand 10 after
4387 // The page transition below is only for the purpose of inserting the tab. 4387 // The page transition below is only for the purpose of inserting the tab.
4388 browser->AddTab(view_source_contents, PageTransition::LINK); 4388 browser->AddTab(view_source_contents, PageTransition::LINK);
4389 } 4389 }
4390 4390
4391 if (profile_->HasSessionService()) { 4391 if (profile_->HasSessionService()) {
4392 SessionService* session_service = profile_->GetSessionService(); 4392 SessionService* session_service = profile_->GetSessionService();
4393 if (session_service) 4393 if (session_service)
4394 session_service->TabRestored(&view_source_contents->controller(), false); 4394 session_service->TabRestored(&view_source_contents->controller(), false);
4395 } 4395 }
4396 } 4396 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_list.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698