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

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

Issue 7584004: Keeping the current directory in URL. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Conflicts resolved. Created 9 years, 4 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/resources/file_manager/js/main.js ('k') | chrome/chrome_browser.gypi » ('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 <windows.h> 8 #include <windows.h>
9 #include <shellapi.h> 9 #include <shellapi.h>
10 #endif // OS_WIN 10 #endif // OS_WIN
(...skipping 137 matching lines...) Expand 10 before | Expand all | Expand 10 after
148 #include "chrome/browser/ui/views/location_bar/location_bar_view.h" 148 #include "chrome/browser/ui/views/location_bar/location_bar_view.h"
149 #include "ui/base/win/shell.h" 149 #include "ui/base/win/shell.h"
150 #endif // OS_WIN 150 #endif // OS_WIN
151 151
152 #if defined(OS_MACOSX) 152 #if defined(OS_MACOSX)
153 #include "content/browser/find_pasteboard.h" 153 #include "content/browser/find_pasteboard.h"
154 #endif 154 #endif
155 155
156 #if defined(OS_CHROMEOS) 156 #if defined(OS_CHROMEOS)
157 #include "chrome/browser/chromeos/boot_times_loader.h" 157 #include "chrome/browser/chromeos/boot_times_loader.h"
158 #include "chrome/browser/extensions/file_manager_util.h"
159 #include "chrome/browser/ui/webui/active_downloads_ui.h" 158 #include "chrome/browser/ui/webui/active_downloads_ui.h"
160 #else 159 #else
161 #include "chrome/browser/download/download_shelf.h" 160 #include "chrome/browser/download/download_shelf.h"
162 #endif 161 #endif
163 162
163 #if defined(FILE_MANAGER_EXTENSION)
164 #include "chrome/browser/extensions/file_manager_util.h"
165 #endif
166
164 using base::TimeDelta; 167 using base::TimeDelta;
165 168
166 /////////////////////////////////////////////////////////////////////////////// 169 ///////////////////////////////////////////////////////////////////////////////
167 170
168 namespace { 171 namespace {
169 172
170 // The URL to be loaded to display Help. 173 // The URL to be loaded to display Help.
171 const char kHelpContentUrl[] = 174 const char kHelpContentUrl[] =
172 #if defined(OS_CHROMEOS) 175 #if defined(OS_CHROMEOS)
173 #if defined(OFFICIAL_BUILD) 176 #if defined(OFFICIAL_BUILD)
(...skipping 4666 matching lines...) Expand 10 before | Expand all | Expand 10 after
4840 } 4843 }
4841 4844
4842 void Browser::ShowSyncSetup() { 4845 void Browser::ShowSyncSetup() {
4843 ProfileSyncService* service = 4846 ProfileSyncService* service =
4844 profile()->GetOriginalProfile()->GetProfileSyncService(); 4847 profile()->GetOriginalProfile()->GetProfileSyncService();
4845 if (service->HasSyncSetupCompleted()) 4848 if (service->HasSyncSetupCompleted())
4846 ShowOptionsTab(chrome::kSyncSetupSubPage); 4849 ShowOptionsTab(chrome::kSyncSetupSubPage);
4847 else 4850 else
4848 service->ShowLoginDialog(); 4851 service->ShowLoginDialog();
4849 } 4852 }
OLDNEW
« no previous file with comments | « chrome/browser/resources/file_manager/js/main.js ('k') | chrome/chrome_browser.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698