chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc - Issue 143733002: Remove FILE_MANAGER_EXTENSION and related configuration. They can be folded back to Chrome OS as co…

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

Issue 143733002: Remove FILE_MANAGER_EXTENSION and related configuration. They can be folded back to Chrome OS as co… (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 6 years, 11 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 side-by-side diff with in-line comments

Download patch

Index: chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

diff --git a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

index 339bc04bb2670916fbaf8af30b5d8a501b90781b..d6b1094e62b2ade2ce0234c3a3b5a291bb78f516 100644

--- a/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

+++ b/chrome/browser/ui/views/ash/chrome_browser_main_extra_parts_ash.cc

@@ -21,7 +21,7 @@

#include "ui/keyboard/keyboard_util.h"

#include "ui/views/widget/desktop_aura/desktop_screen.h"

-#if defined(FILE_MANAGER_EXTENSION)

+#if defined(OS_CHROMEOS)

#include "chrome/browser/ui/views/select_file_dialog_extension.h"

#include "chrome/browser/ui/views/select_file_dialog_extension_factory.h"

#endif

@@ -83,7 +83,7 @@ void ChromeBrowserMainExtraPartsAsh::PreProfileInit() {

keyboard::InitializeKeyboard();

#endif

-#if defined(FILE_MANAGER_EXTENSION)

+#if defined(OS_CHROMEOS)

ui::SelectFileDialog::SetFactory(new SelectFileDialogExtensionFactory);

#endif

}

« no previous file with comments | « chrome/browser/translate/translate_manager_unittest.cc ('k') | chrome/chrome_browser_ui.gypi » ('j') | no next file with comments »