summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--chrome/renderer/render_process.h7
-rw-r--r--chrome/renderer/render_thread.h7
-rw-r--r--chrome/test/automation/automation_proxy.h13
-rw-r--r--chrome/test/automation/window_proxy.h7
-rw-r--r--chrome/views/base_button.h5
-rw-r--r--chrome/views/button.h5
-rw-r--r--chrome/views/button_dropdown.h5
-rw-r--r--chrome/views/dialog_delegate.h4
-rw-r--r--chrome/views/native_button.h7
-rw-r--r--chrome/views/native_control.h4
-rw-r--r--chrome/views/table_view.h3
-rw-r--r--chrome/views/view.h12
-rw-r--r--chrome/views/window.h8
13 files changed, 31 insertions, 56 deletions
diff --git a/chrome/renderer/render_process.h b/chrome/renderer/render_process.h
index 8f2fdbc..df96a2c 100644
--- a/chrome/renderer/render_process.h
+++ b/chrome/renderer/render_process.h
@@ -9,8 +9,6 @@
#include "chrome/common/child_process.h"
#include "chrome/renderer/render_thread.h"
-class RenderView;
-
// Represents the renderer end of the browser<->renderer connection. The
// opposite end is the RenderProcessHost. This is a singleton object for
// each renderer.
@@ -38,7 +36,7 @@ class RenderProcess : public ChildProcess {
private:
friend class ChildProcessFactory<RenderProcess>;
- RenderProcess(const std::wstring& channel_name);
+ explicit RenderProcess(const std::wstring& channel_name);
~RenderProcess();
// Returns a pointer to the RenderProcess singleton instance. This is
@@ -80,8 +78,7 @@ class RenderProcess : public ChildProcess {
static bool load_plugins_in_process_;
- DISALLOW_EVIL_CONSTRUCTORS(RenderProcess);
+ DISALLOW_COPY_AND_ASSIGN(RenderProcess);
};
#endif // CHROME_RENDERER_RENDER_PROCESS_H__
-
diff --git a/chrome/renderer/render_thread.h b/chrome/renderer/render_thread.h
index 95ee58f..7d6bca0 100644
--- a/chrome/renderer/render_thread.h
+++ b/chrome/renderer/render_thread.h
@@ -5,6 +5,8 @@
#ifndef CHROME_RENDERER_RENDER_THREAD_H_
#define CHROME_RENDERER_RENDER_THREAD_H_
+#include <vector>
+
#include "base/file_path.h"
#include "base/gfx/native_widget_types.h"
#include "base/ref_counted.h"
@@ -17,7 +19,6 @@
#include "chrome/common/modal_dialog_event.h"
class SkBitmap;
-class Task;
class VisitedLinkSlave;
struct WebPreferences;
class RenderDnsMaster;
@@ -56,7 +57,7 @@ class RenderThread : public IPC::Channel::Listener,
public RenderThreadBase,
public base::Thread {
public:
- RenderThread(const std::wstring& channel_name);
+ explicit RenderThread(const std::wstring& channel_name);
virtual ~RenderThread();
// IPC::Channel::Listener implementation:
@@ -141,7 +142,7 @@ class RenderThread : public IPC::Channel::Listener,
int in_send_;
- DISALLOW_EVIL_CONSTRUCTORS(RenderThread);
+ DISALLOW_COPY_AND_ASSIGN(RenderThread);
};
// The global RenderThread object for this process. Note that this should only
diff --git a/chrome/test/automation/automation_proxy.h b/chrome/test/automation/automation_proxy.h
index dc53672..22fdebc 100644
--- a/chrome/test/automation/automation_proxy.h
+++ b/chrome/test/automation/automation_proxy.h
@@ -18,9 +18,8 @@
class AutomationRequest;
class BrowserProxy;
-class WindowProxy;
class TabProxy;
-class AutocompleteEditProxy;
+class WindowProxy;
// This is an interface that AutomationProxy-related objects can use to
// access the message-sending abilities of the Proxy.
@@ -178,9 +177,9 @@ class AutomationProxy : public IPC::Channel::Listener,
// Clears the current AutomationRequest object.
void clear_current_request() { current_request_ = NULL; }
- // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the message
- // from AutomationProxy, unpacks the messages and routes that call to the
- // tracker.
+ // Wrapper over AutomationHandleTracker::InvalidateHandle. Receives the
+ // message from AutomationProxy, unpacks the messages and routes that call to
+ // the tracker.
void InvalidateHandle(const IPC::Message& message);
// Creates a tab that can hosted in an external process. The function
@@ -194,8 +193,6 @@ class AutomationProxy : public IPC::Channel::Listener,
}
private:
- DISALLOW_EVIL_CONSTRUCTORS(AutomationProxy);
-
void InitializeEvents();
void InitializeChannelID();
void InitializeThread();
@@ -216,6 +213,8 @@ class AutomationProxy : public IPC::Channel::Listener,
// Delay to let the browser execute the command.
int command_execution_timeout_ms_;
+
+ DISALLOW_COPY_AND_ASSIGN(AutomationProxy);
};
#endif // CHROME_TEST_AUTOMATION_AUTOMATION_PROXY_H__
diff --git a/chrome/test/automation/window_proxy.h b/chrome/test/automation/window_proxy.h
index 1f3da79..76c863e 100644
--- a/chrome/test/automation/window_proxy.h
+++ b/chrome/test/automation/window_proxy.h
@@ -12,9 +12,7 @@
#include "base/thread.h"
#include "chrome/test/automation/automation_handle_tracker.h"
-class GURL;
class BrowserProxy;
-class TabProxy;
class WindowProxy;
namespace gfx {
@@ -86,8 +84,7 @@ class WindowProxy : public AutomationResourceProxy {
BrowserProxy* GetBrowserWithTimeout(uint32 timeout_ms, bool* is_timeout);
private:
- DISALLOW_EVIL_CONSTRUCTORS(WindowProxy);
+ DISALLOW_COPY_AND_ASSIGN(WindowProxy);
};
-#endif // CHROME_TEST_AUTOMATION_WINDOW_PROXY_H__
-
+#endif // CHROME_TEST_AUTOMATION_WINDOW_PROXY_H__
diff --git a/chrome/views/base_button.h b/chrome/views/base_button.h
index d9ed2e3..7d6c66a 100644
--- a/chrome/views/base_button.h
+++ b/chrome/views/base_button.h
@@ -9,7 +9,6 @@
#include "chrome/views/event.h"
#include "chrome/views/view.h"
-class OSExchangeData;
class ThrobAnimation;
namespace views {
@@ -165,8 +164,6 @@ class BaseButton : public View,
scoped_ptr<ThrobAnimation> hover_animation_;
private:
- DISALLOW_EVIL_CONSTRUCTORS(BaseButton);
-
// The current listener
ButtonListener* listener_;
@@ -179,6 +176,8 @@ class BaseButton : public View,
// Should we animate when the state changes? Defaults to true, but false while
// throbbing.
bool animate_on_state_change_;
+
+ DISALLOW_COPY_AND_ASSIGN(BaseButton);
};
} // namespace views
diff --git a/chrome/views/button.h b/chrome/views/button.h
index 814bf94..df8c463 100644
--- a/chrome/views/button.h
+++ b/chrome/views/button.h
@@ -10,8 +10,6 @@
namespace views {
-class MouseEvent;
-
////////////////////////////////////////////////////////////////////////////////
//
// Button
@@ -82,7 +80,7 @@ class Button : public BaseButton {
// The tooltip text or empty string for none.
std::wstring tooltip_text_;
- DISALLOW_EVIL_CONSTRUCTORS(Button);
+ DISALLOW_COPY_AND_ASSIGN(Button);
};
////////////////////////////////////////////////////////////////////////////////
@@ -131,4 +129,3 @@ class ToggleButton : public Button {
} // namespace views
#endif // CHROME_VIEWS_BUTTON_H_
-
diff --git a/chrome/views/button_dropdown.h b/chrome/views/button_dropdown.h
index eac7e418..380426c 100644
--- a/chrome/views/button_dropdown.h
+++ b/chrome/views/button_dropdown.h
@@ -9,8 +9,6 @@
#include "chrome/views/button.h"
#include "chrome/views/menu.h"
-class Timer;
-
namespace views {
////////////////////////////////////////////////////////////////////////////////
@@ -66,10 +64,9 @@ class ButtonDropDown : public Button {
// A factory for tasks that show the dropdown context menu for the button.
ScopedRunnableMethodFactory<ButtonDropDown> show_menu_factory_;
- DISALLOW_EVIL_CONSTRUCTORS(ButtonDropDown);
+ DISALLOW_COPY_AND_ASSIGN(ButtonDropDown);
};
} // namespace views
#endif // CHROME_VIEWS_BUTTON_DROPDOWN_H__
-
diff --git a/chrome/views/dialog_delegate.h b/chrome/views/dialog_delegate.h
index c578790..a8b72e0f 100644
--- a/chrome/views/dialog_delegate.h
+++ b/chrome/views/dialog_delegate.h
@@ -10,7 +10,6 @@
namespace views {
-class NativeButton;
class View;
///////////////////////////////////////////////////////////////////////////////
@@ -109,5 +108,4 @@ class DialogDelegate : public WindowDelegate {
} // namespace views
-#endif // #ifndef CHROME_VIEWS_DIALOG_DELEGATE_H_
-
+#endif // CHROME_VIEWS_DIALOG_DELEGATE_H_
diff --git a/chrome/views/native_button.h b/chrome/views/native_button.h
index 655c49c..098fad0 100644
--- a/chrome/views/native_button.h
+++ b/chrome/views/native_button.h
@@ -13,8 +13,6 @@
namespace views {
-class HWNDView;
-
////////////////////////////////////////////////////////////////////////////////
//
// NativeButton is a wrapper for a windows native button
@@ -120,7 +118,7 @@ class NativeButton : public NativeControl {
void Clicked();
// Whether the button preferred size should follow the Microsoft layout
- // guidelines. Default is true.
+ // guidelines. Default is true.
bool enforce_dlu_min_size_;
std::wstring label_;
@@ -140,10 +138,9 @@ class NativeButton : public NativeControl {
// Storage of strings needed for accessibility.
std::wstring accessible_name_;
- DISALLOW_EVIL_CONSTRUCTORS(NativeButton);
+ DISALLOW_COPY_AND_ASSIGN(NativeButton);
};
} // namespace views
#endif // CHROME_VIEWS_NATIVE_BUTTON_H__
-
diff --git a/chrome/views/native_control.h b/chrome/views/native_control.h
index 961d897..7243055 100644
--- a/chrome/views/native_control.h
+++ b/chrome/views/native_control.h
@@ -13,7 +13,6 @@ namespace views {
class HWNDView;
class NativeControlContainer;
-class RootView;
////////////////////////////////////////////////////////////////////////////////
//
@@ -125,10 +124,9 @@ class NativeControl : public View {
NativeControlContainer* container_;
- DISALLOW_EVIL_CONSTRUCTORS(NativeControl);
+ DISALLOW_COPY_AND_ASSIGN(NativeControl);
};
} // namespace views
#endif // CHROME_VIEWS_NATIVE_CONTROL_H__
-
diff --git a/chrome/views/table_view.h b/chrome/views/table_view.h
index cb223c6..c6fb2f7 100644
--- a/chrome/views/table_view.h
+++ b/chrome/views/table_view.h
@@ -22,7 +22,7 @@
// TODO(port): remove the ifdef when native_control.h is ported.
#include "chrome/views/native_control.h"
#endif // defined(OS_WIN)
-#include "SkColor.h"
+#include "skia/include/SkColor.h"
class SkBitmap;
@@ -50,7 +50,6 @@ class SkBitmap;
// TableView is a wrapper around the window type ListView in report mode.
namespace views {
-class HWNDView;
class ListView;
class ListViewParent;
class TableView;
diff --git a/chrome/views/view.h b/chrome/views/view.h
index 52f2665..8651183 100644
--- a/chrome/views/view.h
+++ b/chrome/views/view.h
@@ -8,12 +8,14 @@
#include "build/build_config.h"
#if defined(OS_WIN)
-#include <atlbase.h>
-#include <atlapp.h>
-#include <atlmisc.h>
+#include <atlbase.h>
+#include <atlapp.h>
+#include <atlmisc.h>
#endif // defined(OS_WIN)
+#include <algorithm>
#include <map>
+#include <string>
#include <vector>
#include "base/gfx/rect.h"
@@ -30,7 +32,6 @@ class Path;
class AccessibleWrapper;
class ChromeCanvas;
class OSExchangeData;
-class SkBitmap;
namespace views {
@@ -93,7 +94,7 @@ class DragController {
// View class
//
// A View is a rectangle within the views View hierarchy. It is the base
-/// class for all Views.
+// class for all Views.
//
// A View is a container of other Views (there is no such thing as a Leaf
// View - makes code simpler, reduces type conversion headaches, design
@@ -1331,4 +1332,3 @@ class View : public AcceleratorTarget {
} // namespace views
#endif // CHROME_VIEWS_VIEW_H_
-
diff --git a/chrome/views/window.h b/chrome/views/window.h
index 1a3e9ab..69316e4 100644
--- a/chrome/views/window.h
+++ b/chrome/views/window.h
@@ -9,13 +9,10 @@
#include "chrome/views/widget_win.h"
namespace gfx {
-class Size;
-class Path;
class Point;
+class Size;
};
-class PrefService;
-
namespace views {
class ClientView;
@@ -270,10 +267,9 @@ class Window : public WidgetWin,
// Hold onto notifications.
NotificationRegistrar notification_registrar_;
- DISALLOW_EVIL_CONSTRUCTORS(Window);
+ DISALLOW_COPY_AND_ASSIGN(Window);
};
} // namespace views
#endif // CHROME_VIEWS_WINDOW_H__
-
generated by cgit v1.1 at 2025-01-16 10:58:06 +0000