summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--build/common.gypi5
-rw-r--r--chrome/browser/chrome_browser_main.cc5
-rw-r--r--chrome/browser/chrome_browser_main_win.cc2
-rw-r--r--chrome/browser/process_singleton.h2
-rw-r--r--chrome/browser/process_singleton_aura.cc2
-rw-r--r--chrome/browser/renderer_host/render_widget_host_view_views_win.cc6
-rw-r--r--chrome/browser/ui/toolbar/wrench_menu_model.cc8
-rw-r--r--chrome/browser/ui/views/dropdown_bar_host.cc12
-rw-r--r--chrome/browser/ui/views/shell_dialogs_aura.cc4
-rw-r--r--chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc10
-rw-r--r--content/browser/renderer_host/render_message_filter_aura.cc2
-rw-r--r--content/plugin/webplugin_delegate_stub.cc6
-rw-r--r--content/plugin/webplugin_delegate_stub.h2
-rw-r--r--content/plugin/webplugin_proxy.cc2
-rw-r--r--content/plugin/webplugin_proxy.h2
-rw-r--r--printing/printed_document_aura.cc6
-rw-r--r--views/views.gyp4
-rw-r--r--webkit/plugins/npapi/webplugin_delegate_impl.h8
18 files changed, 48 insertions, 40 deletions
diff --git a/build/common.gypi b/build/common.gypi
index a4cda52..9963f45 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -309,6 +309,11 @@
'file_manager_extension%': 0,
}],
+ # ... except on Windows even with Aura.
+ ['use_aura==1 and OS=="win"', {
+ 'file_manager_extension%': 0,
+ }],
+
# Enable WebUI TaskManager only on Chrome OS, Touch or PureView.
['chromeos==1 or touchui==1 or use_only_pure_views==1 or use_aura==1', {
'webui_task_manager%': 1,
diff --git a/chrome/browser/chrome_browser_main.cc b/chrome/browser/chrome_browser_main.cc
index bd3c53d..92e6d4c 100644
--- a/chrome/browser/chrome_browser_main.cc
+++ b/chrome/browser/chrome_browser_main.cc
@@ -200,7 +200,8 @@
#endif
#if defined(USE_AURA)
-#include "chrome/browser/ui/views/aura/aura_init.h"
+#include "ui/aura/desktop.h"
+#include "ui/aura_shell/shell_factory.h"
#include "ui/aura/desktop.h"
#endif
@@ -1367,7 +1368,7 @@ int ChromeBrowserMainParts::PreMainMessageLoopRunInternal() {
child_process_logging::SetCommandLine(CommandLine::ForCurrentProcess());
#if defined(USE_AURA)
- browser::InitAuraDesktop();
+ aura_shell::InitDesktopWindow();
#elif defined(TOOLKIT_VIEWS)
views::Widget::SetPureViews(
CommandLine::ForCurrentProcess()->HasSwitch(switches::kUsePureViews));
diff --git a/chrome/browser/chrome_browser_main_win.cc b/chrome/browser/chrome_browser_main_win.cc
index 95a0f38..711193c 100644
--- a/chrome/browser/chrome_browser_main_win.cc
+++ b/chrome/browser/chrome_browser_main_win.cc
@@ -74,11 +74,13 @@ void WarnAboutMinimumSystemRequirements() {
}
}
+#if !defined(USE_AURA)
void ShowMissingLocaleMessageBox() {
ui::MessageBox(NULL, ASCIIToUTF16(chrome_browser::kMissingLocaleDataMessage),
ASCIIToUTF16(chrome_browser::kMissingLocaleDataTitle),
MB_OK | MB_ICONERROR | MB_TOPMOST);
}
+#endif
void RecordBrowserStartupTime() {
// Calculate the time that has elapsed from our own process creation.
diff --git a/chrome/browser/process_singleton.h b/chrome/browser/process_singleton.h
index 86557d3..457b283 100644
--- a/chrome/browser/process_singleton.h
+++ b/chrome/browser/process_singleton.h
@@ -78,7 +78,7 @@ class ProcessSingleton : public base::NonThreadSafe {
int timeout_seconds);
#endif // defined(OS_LINUX)
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// Used in specific cases to let us know that there is an existing instance
// of Chrome running with this profile. In general, you should not use this
// function. Instead consider using NotifyOtherProcessOrCreate().
diff --git a/chrome/browser/process_singleton_aura.cc b/chrome/browser/process_singleton_aura.cc
index 5de600b..ba1aa98 100644
--- a/chrome/browser/process_singleton_aura.cc
+++ b/chrome/browser/process_singleton_aura.cc
@@ -7,7 +7,7 @@
// Look for a Chrome instance that uses the same profile directory.
ProcessSingleton::ProcessSingleton(const FilePath& user_data_dir)
:
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
window_(NULL),
#endif
locked_(false), foreground_window_(NULL) {
diff --git a/chrome/browser/renderer_host/render_widget_host_view_views_win.cc b/chrome/browser/renderer_host/render_widget_host_view_views_win.cc
index 6aaba05..0584b40 100644
--- a/chrome/browser/renderer_host/render_widget_host_view_views_win.cc
+++ b/chrome/browser/renderer_host/render_widget_host_view_views_win.cc
@@ -10,17 +10,15 @@
#endif
#include "views/widget/widget.h"
+#if !defined(USE_AURA)
// static
RenderWidgetHostView* RenderWidgetHostView::CreateViewForWidget(
RenderWidgetHost* widget) {
-#if !defined(USE_AURA)
if (views::Widget::IsPureViews())
-#endif
return new RenderWidgetHostViewViews(widget);
-#if !defined(USE_AURA)
return new RenderWidgetHostViewWin(widget);
-#endif
}
+#endif
void RenderWidgetHostViewViews::UpdateCursor(const WebCursor& cursor) {
}
diff --git a/chrome/browser/ui/toolbar/wrench_menu_model.cc b/chrome/browser/ui/toolbar/wrench_menu_model.cc
index 616d6964..92c8862 100644
--- a/chrome/browser/ui/toolbar/wrench_menu_model.cc
+++ b/chrome/browser/ui/toolbar/wrench_menu_model.cc
@@ -525,9 +525,13 @@ void WrenchMenuModel::Build() {
AddSeparator();
}
-#if defined(OS_MACOSX)
+#if defined(USE_AURA)
+#if defined(OS_WIN)
+ AddItemWithStringId(IDC_OPTIONS, IDS_OPTIONS);
+#else
AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES);
-#elif defined(USE_AURA)
+#endif
+#elif defined(OS_MACOSX)
AddItemWithStringId(IDC_OPTIONS, IDS_PREFERENCES);
#elif defined(TOOLKIT_USES_GTK)
string16 preferences = gtk_util::GetStockPreferencesMenuLabel();
diff --git a/chrome/browser/ui/views/dropdown_bar_host.cc b/chrome/browser/ui/views/dropdown_bar_host.cc
index 841318d..437b97f 100644
--- a/chrome/browser/ui/views/dropdown_bar_host.cc
+++ b/chrome/browser/ui/views/dropdown_bar_host.cc
@@ -18,22 +18,22 @@
#include "views/focus/view_storage.h"
#include "views/widget/widget.h"
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+#include "ui/gfx/scoped_sk_region.h"
+#elif defined(OS_WIN)
#include "base/win/scoped_gdi_object.h"
#elif defined(TOOLKIT_USES_GTK)
#include "ui/base/gtk/scoped_handle_gtk.h"
-#else
-#include "ui/gfx/scoped_sk_region.h"
#endif
namespace {
-#if defined(OS_WIN)
+#if defined(USE_AURA)
+typedef gfx::ScopedSkRegion ScopedPlatformRegion;
+#elif defined(OS_WIN)
typedef base::win::ScopedRegion ScopedPlatformRegion;
#elif defined(TOOLKIT_USES_GTK)
typedef ui::ScopedRegion ScopedPlatformRegion;
-#else
-typedef gfx::ScopedSkRegion ScopedPlatformRegion;
#endif
} // namespace
diff --git a/chrome/browser/ui/views/shell_dialogs_aura.cc b/chrome/browser/ui/views/shell_dialogs_aura.cc
index 2548b9a..3e9c0cb 100644
--- a/chrome/browser/ui/views/shell_dialogs_aura.cc
+++ b/chrome/browser/ui/views/shell_dialogs_aura.cc
@@ -10,5 +10,9 @@
// static
SelectFileDialog* SelectFileDialog::Create(Listener* listener) {
DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
+#if defined(OS_WIN)
+ return NULL;
+#else
return new FileManagerDialog(listener);
+#endif
}
diff --git a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc
index 7bbb395..2ef4db7 100644
--- a/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc
+++ b/chrome/browser/ui/views/tab_contents/native_tab_contents_container_aura.cc
@@ -96,13 +96,3 @@ gfx::NativeViewAccessible
NOTIMPLEMENTED();
return View::GetNativeViewAccessible();
}
-
-////////////////////////////////////////////////////////////////////////////////
-// NativeTabContentsContainer, public:
-
-// static
-NativeTabContentsContainer* NativeTabContentsContainer::CreateNativeContainer(
- TabContentsContainer* container) {
- return new NativeTabContentsContainerViews(container);
- // TODO(beng): return new NativeTabContentsContainerAura(container);
-}
diff --git a/content/browser/renderer_host/render_message_filter_aura.cc b/content/browser/renderer_host/render_message_filter_aura.cc
index a4d7a04..d88cea8 100644
--- a/content/browser/renderer_host/render_message_filter_aura.cc
+++ b/content/browser/renderer_host/render_message_filter_aura.cc
@@ -4,6 +4,8 @@
#include "content/browser/renderer_host/render_message_filter.h"
+#include "ui/gfx/rect.h"
+
// TODO(shess): Provide a mapping from reply_msg->routing_id() to HWND
// so that we can eliminate the NativeViewId parameter.
#if defined(OS_WIN)
diff --git a/content/plugin/webplugin_delegate_stub.cc b/content/plugin/webplugin_delegate_stub.cc
index 2d1037c..73d28b2 100644
--- a/content/plugin/webplugin_delegate_stub.cc
+++ b/content/plugin/webplugin_delegate_stub.cc
@@ -110,7 +110,7 @@ bool WebPluginDelegateStub::OnMessageReceived(const IPC::Message& msg) {
IPC_MESSAGE_HANDLER(PluginMsg_SendJavaScriptStream,
OnSendJavaScriptStream)
IPC_MESSAGE_HANDLER(PluginMsg_SetContentAreaFocus, OnSetContentAreaFocus)
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
IPC_MESSAGE_HANDLER(PluginMsg_ImeCompositionUpdated,
OnImeCompositionUpdated)
IPC_MESSAGE_HANDLER(PluginMsg_ImeCompositionCompleted,
@@ -330,7 +330,7 @@ void WebPluginDelegateStub::OnSetContentAreaFocus(bool has_focus) {
delegate_->SetContentAreaHasFocus(has_focus);
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
void WebPluginDelegateStub::OnImeCompositionUpdated(
const string16& text,
const std::vector<int>& clauses,
@@ -338,7 +338,7 @@ void WebPluginDelegateStub::OnImeCompositionUpdated(
int cursor_position) {
if (delegate_)
delegate_->ImeCompositionUpdated(text, clauses, target, cursor_position);
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
webplugin_->UpdateIMEStatus();
#endif
}
diff --git a/content/plugin/webplugin_delegate_stub.h b/content/plugin/webplugin_delegate_stub.h
index a3be8a0..669abcc 100644
--- a/content/plugin/webplugin_delegate_stub.h
+++ b/content/plugin/webplugin_delegate_stub.h
@@ -81,7 +81,7 @@ class WebPluginDelegateStub : public IPC::Channel::Listener,
void OnGetFormValue(string16* value, bool* success);
void OnSetContentAreaFocus(bool has_focus);
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
void OnImeCompositionUpdated(const string16& text,
const std::vector<int>& clauses,
const std::vector<int>& target,
diff --git a/content/plugin/webplugin_proxy.cc b/content/plugin/webplugin_proxy.cc
index 4b167e1..4b717a0 100644
--- a/content/plugin/webplugin_proxy.cc
+++ b/content/plugin/webplugin_proxy.cc
@@ -748,7 +748,7 @@ void WebPluginProxy::URLRedirectResponse(bool allow, int resource_id) {
Send(new PluginHostMsg_URLRedirectResponse(route_id_, allow, resource_id));
}
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
void WebPluginProxy::UpdateIMEStatus() {
// Retrieve the IME status from a plug-in and send it to a renderer process
// when the plug-in has updated it.
diff --git a/content/plugin/webplugin_proxy.h b/content/plugin/webplugin_proxy.h
index 54f8894..100c767 100644
--- a/content/plugin/webplugin_proxy.h
+++ b/content/plugin/webplugin_proxy.h
@@ -168,7 +168,7 @@ class WebPluginProxy : public webkit::npapi::WebPlugin {
virtual void URLRedirectResponse(bool allow, int resource_id);
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// Retrieves the IME status from a windowless plug-in and sends it to a
// renderer process. A renderer process will convert the coordinates from
// local to the window coordinates and send the converted coordinates to a
diff --git a/printing/printed_document_aura.cc b/printing/printed_document_aura.cc
index a5e4b03..2c204c0 100644
--- a/printing/printed_document_aura.cc
+++ b/printing/printed_document_aura.cc
@@ -8,11 +8,13 @@
namespace printing {
-void PrintedDocument::RenderPrintedPage(
- const PrintedPage& page, PrintingContext* context) const {
+#if defined(OS_POSIX)
+void PrintedDocument::RenderPrintedPage(const PrintedPage& page,
+ PrintingContext* context) const {
// TODO(saintlou): This a stub to allow us to build under Aura.
// See issue: http://crbug.com/99282
NOTIMPLEMENTED();
}
+#endif
} // namespace printing
diff --git a/views/views.gyp b/views/views.gyp
index a568e9e..93e7efc 100644
--- a/views/views.gyp
+++ b/views/views.gyp
@@ -500,14 +500,14 @@
}],
['touchui==0', {
'sources!': [
- 'controls/menu/native_menu_views.cc',
- 'controls/menu/native_menu_views.h',
'touchui/touch_selection_controller_impl.cc',
'touchui/touch_selection_controller_impl.h',
],
}],
['touchui==0 and use_aura==0', {
'sources!': [
+ 'controls/menu/native_menu_views.cc',
+ 'controls/menu/native_menu_views.h',
'widget/tooltip_manager_views.cc',
],
}],
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl.h b/webkit/plugins/npapi/webplugin_delegate_impl.h
index a475f05..0010d3b 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl.h
+++ b/webkit/plugins/npapi/webplugin_delegate_impl.h
@@ -55,7 +55,7 @@ class QuickDrawDrawingManager;
#endif // NP_NO_QUICKDRAW
#endif // OS_MACOSX
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
class WebPluginIMEWin;
#endif // OS_WIN
@@ -147,7 +147,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
// Informs the plugin that the view it is in has gained or lost focus.
void SetContentAreaHasFocus(bool has_focus);
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// Informs the plug-in that an IME has changed its status.
void ImeCompositionUpdated(const string16& text,
const std::vector<int>& clauses,
@@ -331,7 +331,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
WebPlugin* plugin_;
scoped_refptr<PluginInstance> instance_;
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// Original wndproc before we subclassed.
WNDPROC plugin_wnd_proc_;
@@ -371,7 +371,7 @@ class WebPluginDelegateImpl : public WebPluginDelegate {
gfx::Rect clip_rect_;
int quirks_;
-#if defined(OS_WIN)
+#if defined(OS_WIN) && !defined(USE_AURA)
// Windowless plugins don't have keyboard focus causing issues with the
// plugin not receiving keyboard events if the plugin enters a modal
// loop like TrackPopupMenuEx or MessageBox, etc.
generated by cgit v1.1 at 2024-12-26 18:24:41 +0000