chrome/browser/ui/views/select_file_dialog_extension.cc - Issue 12298037: Revert 183123

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

Issue 12298037: Revert 183123 (Closed) Base URL: svn://svn.chromium.org/chrome/branches/1417/src/

Patch Set: Created 7 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/views/frame/browser_view_layout.cc ('k') | chrome/browser/ui/views/tabs/tab_drag_controller.cc » ('j') | no next file with comments »

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/ui/views/select_file_dialog_extension.h"	5 #include "chrome/browser/ui/views/select_file_dialog_extension.h"

6	6

7 #include "base/bind.h"	7 #include "base/bind.h"

8 #include "base/callback.h"	8 #include "base/callback.h"

9 #include "base/logging.h"	9 #include "base/logging.h"

10 #include "base/memory/ref_counted.h"	10 #include "base/memory/ref_counted.h"

11 #include "base/memory/singleton.h"	11 #include "base/memory/singleton.h"

12 #include "base/message_loop.h"	12 #include "base/message_loop.h"

13 #include "chrome/common/pref_names.h"	13 #include "chrome/common/pref_names.h"

14 #include "chrome/browser/chromeos/extensions/file_browser_private_api.h"	14 #include "chrome/browser/chromeos/extensions/file_browser_private_api.h"

15 #include "chrome/browser/chromeos/extensions/file_manager_util.h"	15 #include "chrome/browser/chromeos/extensions/file_manager_util.h"

16 #include "chrome/browser/extensions/extension_host.h"	16 #include "chrome/browser/extensions/extension_host.h"

17 #include "chrome/browser/extensions/extension_service.h"	17 #include "chrome/browser/extensions/extension_service.h"

18 #include "chrome/browser/extensions/extension_system.h"	18 #include "chrome/browser/extensions/extension_system.h"

19 #include "chrome/browser/extensions/shell_window_registry.h"	19 #include "chrome/browser/extensions/shell_window_registry.h"

20 #include "chrome/browser/profiles/profile.h"

21 #include "chrome/browser/sessions/session_tab_helper.h"	20 #include "chrome/browser/sessions/session_tab_helper.h"

22 #include "chrome/browser/ui/base_window.h"	21 #include "chrome/browser/ui/base_window.h"

23 #include "chrome/browser/ui/browser.h"	22 #include "chrome/browser/ui/browser.h"

24 #include "chrome/browser/ui/browser_finder.h"	23 #include "chrome/browser/ui/browser_finder.h"

25 #include "chrome/browser/ui/browser_list.h"	24 #include "chrome/browser/ui/browser_list.h"

26 #include "chrome/browser/ui/browser_window.h"	25 #include "chrome/browser/ui/browser_window.h"

27 #include "chrome/browser/ui/chrome_select_file_policy.h"	26 #include "chrome/browser/ui/chrome_select_file_policy.h"

28 #include "chrome/browser/ui/extensions/native_app_window.h"	27 #include "chrome/browser/ui/extensions/native_app_window.h"

29 #include "chrome/browser/ui/extensions/shell_window.h"	28 #include "chrome/browser/ui/extensions/shell_window.h"

30 #include "chrome/browser/ui/host_desktop.h"	29 #include "chrome/browser/ui/host_desktop.h"

(...skipping 323 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
354 kFileManagerMinimumHeight);	353 kFileManagerMinimumHeight);

355	354

356 // Connect our listener to FileDialogFunction's per-tab callbacks.	355 // Connect our listener to FileDialogFunction's per-tab callbacks.

357 AddPending(tab_id);	356 AddPending(tab_id);

358	357

359 extension_dialog_ = dialog;	358 extension_dialog_ = dialog;

360 params_ = params;	359 params_ = params;

361 tab_id_ = tab_id;	360 tab_id_ = tab_id;

362 owner_window_ = owner_window;	361 owner_window_ = owner_window;

363 }	362 }

OLD	NEW