OLD | NEW |
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 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/chromeos/drive/file_task_executor.h" | 5 #include "chrome/browser/chromeos/drive/file_task_executor.h" |
6 | 6 |
7 #include <string> | 7 #include <string> |
8 #include <vector> | 8 #include <vector> |
9 | 9 |
10 #include "chrome/browser/chromeos/drive/drive.pb.h" | 10 #include "chrome/browser/chromeos/drive/drive.pb.h" |
(...skipping 26 matching lines...) Expand all Loading... |
37 } | 37 } |
38 | 38 |
39 virtual DriveServiceInterface* GetDriveService() OVERRIDE { | 39 virtual DriveServiceInterface* GetDriveService() OVERRIDE { |
40 return util::GetDriveServiceByProfile(profile_); | 40 return util::GetDriveServiceByProfile(profile_); |
41 } | 41 } |
42 | 42 |
43 virtual void OpenBrowserWindow(const GURL& open_link) OVERRIDE { | 43 virtual void OpenBrowserWindow(const GURL& open_link) OVERRIDE { |
44 chrome::ScopedTabbedBrowserDisplayer displayer( | 44 chrome::ScopedTabbedBrowserDisplayer displayer( |
45 profile_, chrome::HOST_DESKTOP_TYPE_ASH); | 45 profile_, chrome::HOST_DESKTOP_TYPE_ASH); |
46 chrome::AddSelectedTabWithURL(displayer.browser(), open_link, | 46 chrome::AddSelectedTabWithURL(displayer.browser(), open_link, |
47 content::PAGE_TRANSITION_LINK); | 47 ui::PAGE_TRANSITION_LINK); |
48 // Since the ScopedTabbedBrowserDisplayer does not guarantee that the | 48 // Since the ScopedTabbedBrowserDisplayer does not guarantee that the |
49 // browser will be shown on the active desktop, we ensure the visibility. | 49 // browser will be shown on the active desktop, we ensure the visibility. |
50 multi_user_util::MoveWindowToCurrentDesktop( | 50 multi_user_util::MoveWindowToCurrentDesktop( |
51 displayer.browser()->window()->GetNativeWindow()); | 51 displayer.browser()->window()->GetNativeWindow()); |
52 } | 52 } |
53 | 53 |
54 private: | 54 private: |
55 Profile* const profile_; | 55 Profile* const profile_; |
56 }; | 56 }; |
57 | 57 |
(...skipping 97 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
155 void FileTaskExecutor::Done(bool success) { | 155 void FileTaskExecutor::Done(bool success) { |
156 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); | 156 DCHECK(content::BrowserThread::CurrentlyOn(content::BrowserThread::UI)); |
157 if (!done_.is_null()) | 157 if (!done_.is_null()) |
158 done_.Run(success | 158 done_.Run(success |
159 ? extensions::api::file_manager_private::TASK_RESULT_OPENED | 159 ? extensions::api::file_manager_private::TASK_RESULT_OPENED |
160 : extensions::api::file_manager_private::TASK_RESULT_FAILED); | 160 : extensions::api::file_manager_private::TASK_RESULT_FAILED); |
161 delete this; | 161 delete this; |
162 } | 162 } |
163 | 163 |
164 } // namespace drive | 164 } // namespace drive |
OLD | NEW |