Skip to content

Commit 1c21814

Browse files
rogerwangrogerwang
committed
Revert "Fix linux javascript dialog"
This reverts commit 5860b0d.
1 parent 5860b0d commit 1c21814

7 files changed

+0
-184
lines changed

‎nw.gypi

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@
5050
'dependencies': [
5151
'<(DEPTH)/base/base.gyp:base',
5252
'<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
53-
'<(DEPTH)/components/components.gyp:app_modal',
5453
'<(DEPTH)/components/components.gyp:autofill_content_renderer',
5554
'<(DEPTH)/components/components.gyp:keyed_service_content',
5655
'<(DEPTH)/components/components_resources.gyp:components_resources',
@@ -78,7 +77,6 @@
7877
'<(DEPTH)/v8/tools/gyp/v8.gyp:v8',
7978
'<(DEPTH)/third_party/zlib/zlib.gyp:minizip',
8079
'<(DEPTH)/third_party/WebKit/public/blink.gyp:blink',
81-
'<(DEPTH)/components/components_strings.gyp:components_strings',
8280
'nw_resources',
8381
'commit_id',
8482
],
@@ -122,11 +120,6 @@
122120
'<(DEPTH)/chrome/browser/ui/cocoa/custom_frame_view.h',
123121
'<(DEPTH)/chrome/browser/ui/cocoa/custom_frame_view.mm',
124122
'<(DEPTH)/chrome/browser/ui/base_window.h',
125-
'<(DEPTH)/chrome/browser/ui/views/chrome_javascript_native_dialog_factory_views.cc',
126-
'<(DEPTH)/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.cc',
127-
'<(DEPTH)/chrome/browser/ui/views/javascript_app_modal_dialog_views_x11.h',
128-
'<(DEPTH)/chrome/browser/ui/views/javascript_app_modal_event_blocker_x11.cc',
129-
'<(DEPTH)/chrome/browser/ui/views/javascript_app_modal_event_blocker_x11.h',
130123
'<(DEPTH)/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.cc',
131124
'<(DEPTH)/chrome/browser/ui/views/status_icons/status_icon_linux_wrapper.h',
132125
'<(DEPTH)/chrome/browser/ui/views/status_icons/status_icon_win.cc',
@@ -275,8 +268,6 @@
275268
'src/browser/shell_download_manager_delegate.h',
276269
'src/browser/shell_download_manager_delegate_win.cc',
277270
'src/browser/shell_download_manager_delegate_mac.mm',
278-
'src/browser/nw_constrained_window_views_client.cc',
279-
'src/browser/nw_constrained_window_views_client.h',
280271
'src/browser/shell_javascript_dialog_creator.cc',
281272
'src/browser/shell_javascript_dialog_creator.h',
282273
# 'src/browser/shell_javascript_dialog_gtk.cc',
@@ -666,7 +657,6 @@
666657
'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_resources_100_percent.pak',
667658
'<(SHARED_INTERMEDIATE_DIR)/ui/resources/webui_resources.pak',
668659
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/app_locale_settings_en-US.pak',
669-
'<(SHARED_INTERMEDIATE_DIR)/components/strings/components_strings_en-US.pak',
670660
'<(SHARED_INTERMEDIATE_DIR)/ui/strings/ui_strings_en-US.pak',
671661
'<(SHARED_INTERMEDIATE_DIR)/webkit/devtools_resources.pak',
672662
'<(SHARED_INTERMEDIATE_DIR)/blink/public/resources/blink_resources.pak',

‎src/browser/native_window_aura.cc

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -275,14 +275,6 @@ gfx::Size NativeWindowFrameView::GetMaximumSize() const {
275275

276276
} // namespace
277277

278-
NativeWindowAura* NativeWindowAura::GetBrowserViewForNativeWindow(
279-
gfx::NativeWindow window) {
280-
views::Widget* widget = views::Widget::GetWidgetForNativeWindow(window);
281-
return widget ?
282-
reinterpret_cast<NativeWindowAura*>(widget->GetNativeWindowProperty(
283-
"__BROWSER_VIEW__")) : nullptr;
284-
}
285-
286278
NativeWindowAura::NativeWindowAura(const base::WeakPtr<content::Shell>& shell,
287279
base::DictionaryValue* manifest)
288280
: NativeWindow(shell, manifest),
@@ -351,8 +343,6 @@ NativeWindowAura::NativeWindowAura(const base::WeakPtr<content::Shell>& shell,
351343

352344
OnViewWasResized();
353345
window_->SetInitialFocus(ui::SHOW_STATE_NORMAL);
354-
355-
window_->SetNativeWindowProperty("__BROWSER_VIEW__", this);
356346
}
357347

358348
NativeWindowAura::~NativeWindowAura() {

‎src/browser/native_window_aura.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ class NativeWindowAura : public NativeWindow,
5959
explicit NativeWindowAura(const base::WeakPtr<content::Shell>& shell,
6060
base::DictionaryValue* manifest);
6161
virtual ~NativeWindowAura();
62-
static NativeWindowAura* GetBrowserViewForNativeWindow(gfx::NativeWindow window);
6362

6463
SkRegion* draggable_region() { return draggable_region_.get(); }
6564
NativeWindowToolbarAura* toolbar() { return toolbar_; }

‎src/browser/nw_constrained_window_views_client.cc

Lines changed: 0 additions & 137 deletions
This file was deleted.

‎src/browser/nw_constrained_window_views_client.h

Lines changed: 0 additions & 15 deletions
This file was deleted.

‎src/nw_shell.cc

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,6 @@
7070
#include "components/autofill/core/browser/autofill_manager.h"
7171
#include "components/web_modal/web_contents_modal_dialog_manager.h"
7272

73-
#include "components/app_modal/javascript_dialog_manager.h"
7473

7574
#if defined(OS_WIN) || defined(OS_LINUX)
7675
#include "content/nw/src/browser/native_window_aura.h"
@@ -653,13 +652,9 @@ void Shell::DidNavigateMainFramePostCommit(WebContents* web_contents) {
653652
}
654653

655654
JavaScriptDialogManager* Shell::GetJavaScriptDialogManager() {
656-
#if defined(OS_LINUX)
657-
return app_modal::JavaScriptDialogManager::GetInstance();
658-
#else
659655
if (!dialog_creator_.get())
660656
dialog_creator_.reset(new ShellJavaScriptDialogCreator());
661657
return dialog_creator_.get();
662-
#endif
663658
}
664659

665660
bool Shell::AddMessageToConsole(WebContents* source,

‎src/shell_browser_main_parts.cc

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
#include "content/nw/src/nw_package.h"
3838
#include "content/nw/src/nw_shell.h"
3939
#include "content/nw/src/shell_browser_context.h"
40-
#include "content/nw/src/browser/nw_constrained_window_views_client.h"
4140
#include "content/public/common/content_switches.h"
4241
#include "content/public/common/main_function_params.h"
4342
#include "grit/net_resources.h"
@@ -69,8 +68,6 @@
6968
#include "ui/views/linux_ui/linux_ui.h"
7069
#endif
7170

72-
#include "chrome/browser/ui/app_modal/chrome_javascript_native_dialog_factory.h"
73-
7471
using base::MessageLoop;
7572

7673
namespace {
@@ -244,9 +241,6 @@ void ShellBrowserMainParts::Init() {
244241
NULL,
245242
MSG_ROUTING_NONE,
246243
NULL);
247-
248-
InstallChromeJavaScriptNativeDialogFactory();
249-
nw::InstallConstrainedWindowViewsClient();
250244
}
251245

252246
bool ShellBrowserMainParts::ProcessSingletonNotificationCallback(

0 commit comments

Comments
 (0)