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

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

Issue 6312156: Change includes of gfx/* to ui/gfx/* (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Created 9 years, 10 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_dialogs.h » ('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/threading/thread.h" 21 #include "base/threading/thread.h"
22 #include "base/threading/thread_restrictions.h" 22 #include "base/threading/thread_restrictions.h"
23 #include "base/utf_string_conversions.h" 23 #include "base/utf_string_conversions.h"
24 #include "gfx/point.h"
25 #include "chrome/app/chrome_command_ids.h" 24 #include "chrome/app/chrome_command_ids.h"
26 #include "chrome/browser/autofill/autofill_manager.h" 25 #include "chrome/browser/autofill/autofill_manager.h"
27 #include "chrome/browser/bookmarks/bookmark_model.h" 26 #include "chrome/browser/bookmarks/bookmark_model.h"
28 #include "chrome/browser/bookmarks/bookmark_utils.h" 27 #include "chrome/browser/bookmarks/bookmark_utils.h"
29 #include "chrome/browser/browser_list.h" 28 #include "chrome/browser/browser_list.h"
30 #include "chrome/browser/browser_process.h" 29 #include "chrome/browser/browser_process.h"
31 #include "chrome/browser/browser_shutdown.h" 30 #include "chrome/browser/browser_shutdown.h"
32 #include "chrome/browser/browser_window.h" 31 #include "chrome/browser/browser_window.h"
33 #include "chrome/browser/browser_url_handler.h" 32 #include "chrome/browser/browser_url_handler.h"
34 #include "chrome/browser/character_encoding.h" 33 #include "chrome/browser/character_encoding.h"
(...skipping 69 matching lines...) Expand 10 before | Expand all | Expand 10 after
104 #include "grit/chromium_strings.h" 103 #include "grit/chromium_strings.h"
105 #include "grit/generated_resources.h" 104 #include "grit/generated_resources.h"
106 #include "grit/locale_settings.h" 105 #include "grit/locale_settings.h"
107 #include "net/base/cookie_monster.h" 106 #include "net/base/cookie_monster.h"
108 #include "net/base/net_util.h" 107 #include "net/base/net_util.h"
109 #include "net/base/registry_controlled_domain.h" 108 #include "net/base/registry_controlled_domain.h"
110 #include "net/base/static_cookie_policy.h" 109 #include "net/base/static_cookie_policy.h"
111 #include "net/url_request/url_request_context.h" 110 #include "net/url_request/url_request_context.h"
112 #include "ui/base/animation/animation.h" 111 #include "ui/base/animation/animation.h"
113 #include "ui/base/l10n/l10n_util.h" 112 #include "ui/base/l10n/l10n_util.h"
113 #include "ui/gfx/point.h"
114 #include "webkit/glue/webkit_glue.h" 114 #include "webkit/glue/webkit_glue.h"
115 #include "webkit/glue/window_open_disposition.h" 115 #include "webkit/glue/window_open_disposition.h"
116 116
117 #if defined(OS_WIN) 117 #if defined(OS_WIN)
118 #include "app/win/shell.h" 118 #include "app/win/shell.h"
119 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h" 119 #include "chrome/browser/autofill/autofill_ie_toolbar_import_win.h"
120 #include "chrome/browser/browser_child_process_host.h" 120 #include "chrome/browser/browser_child_process_host.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"
(...skipping 4188 matching lines...) Expand 10 before | Expand all | Expand 10 after
4312 // The page transition below is only for the purpose of inserting the tab. 4312 // The page transition below is only for the purpose of inserting the tab.
4313 browser->AddTab(view_source_contents, PageTransition::LINK); 4313 browser->AddTab(view_source_contents, PageTransition::LINK);
4314 } 4314 }
4315 4315
4316 if (profile_->HasSessionService()) { 4316 if (profile_->HasSessionService()) {
4317 SessionService* session_service = profile_->GetSessionService(); 4317 SessionService* session_service = profile_->GetSessionService();
4318 if (session_service) 4318 if (session_service)
4319 session_service->TabRestored(&view_source_contents->controller(), false); 4319 session_service->TabRestored(&view_source_contents->controller(), false);
4320 } 4320 }
4321 } 4321 }
OLDNEW
« no previous file with comments | « chrome/browser/ui/browser.h ('k') | chrome/browser/ui/browser_dialogs.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698