summaryrefslogtreecommitdiffstats
path: root/ui/base
diff options
context:
space:
mode:
Diffstat (limited to 'ui/base')
-rw-r--r--ui/base/accelerators/accelerator_manager_unittest.cc2
-rw-r--r--ui/base/clipboard/clipboard_aurax11.cc12
-rw-r--r--ui/base/clipboard/clipboard_unittest.cc2
-rw-r--r--ui/base/cursor/cursor_loader_x11.h18
-rw-r--r--ui/base/dragdrop/drag_utils.cc5
-rw-r--r--ui/base/dragdrop/os_exchange_data_provider_aurax11.h74
-rw-r--r--ui/base/ime/input_method_auralinux.h37
-rw-r--r--ui/base/ime/input_method_base_unittest.cc11
-rw-r--r--ui/base/ime/input_method_minimal.h20
-rw-r--r--ui/base/ime/linux/fake_input_method_context.h9
-rw-r--r--ui/base/ime/linux/fake_input_method_context_factory.h2
-rw-r--r--ui/base/models/tree_node_model_unittest.cc2
-rw-r--r--ui/base/resource/resource_bundle_unittest.cc12
-rw-r--r--ui/base/x/selection_requestor_unittest.cc7
-rw-r--r--ui/base/x/x11_util.h6
15 files changed, 101 insertions, 118 deletions
diff --git a/ui/base/accelerators/accelerator_manager_unittest.cc b/ui/base/accelerators/accelerator_manager_unittest.cc
index ec5a47b..1c3402d7 100644
--- a/ui/base/accelerators/accelerator_manager_unittest.cc
+++ b/ui/base/accelerators/accelerator_manager_unittest.cc
@@ -55,7 +55,7 @@ Accelerator GetAccelerator(KeyboardCode code, int mask) {
class AcceleratorManagerTest : public testing::Test {
public:
AcceleratorManagerTest() {}
- virtual ~AcceleratorManagerTest() {}
+ ~AcceleratorManagerTest() override {}
AcceleratorManager manager_;
};
diff --git a/ui/base/clipboard/clipboard_aurax11.cc b/ui/base/clipboard/clipboard_aurax11.cc
index b12c696..1fef1ad 100644
--- a/ui/base/clipboard/clipboard_aurax11.cc
+++ b/ui/base/clipboard/clipboard_aurax11.cc
@@ -74,11 +74,11 @@ class SelectionChangeObserver : public ui::PlatformEventObserver {
friend struct DefaultSingletonTraits<SelectionChangeObserver>;
SelectionChangeObserver();
- virtual ~SelectionChangeObserver();
+ ~SelectionChangeObserver() override;
// ui::PlatformEventObserver:
- virtual void WillProcessEvent(const ui::PlatformEvent& event) override;
- virtual void DidProcessEvent(const ui::PlatformEvent& event) override {}
+ void WillProcessEvent(const ui::PlatformEvent& event) override;
+ void DidProcessEvent(const ui::PlatformEvent& event) override {}
int event_base_;
Atom clipboard_atom_;
@@ -229,7 +229,7 @@ bool Clipboard::FormatType::Equals(const FormatType& other) const {
class ClipboardAuraX11::AuraX11Details : public PlatformEventDispatcher {
public:
AuraX11Details();
- virtual ~AuraX11Details();
+ ~AuraX11Details() override;
X11AtomCache* atom_cache() { return &atom_cache_; }
@@ -290,8 +290,8 @@ class ClipboardAuraX11::AuraX11Details : public PlatformEventDispatcher {
private:
// PlatformEventDispatcher:
- virtual bool CanDispatchEvent(const PlatformEvent& event) override;
- virtual uint32_t DispatchEvent(const PlatformEvent& event) override;
+ bool CanDispatchEvent(const PlatformEvent& event) override;
+ uint32_t DispatchEvent(const PlatformEvent& event) override;
// Our X11 state.
Display* x_display_;
diff --git a/ui/base/clipboard/clipboard_unittest.cc b/ui/base/clipboard/clipboard_unittest.cc
index 1e05bda..fc34ff5 100644
--- a/ui/base/clipboard/clipboard_unittest.cc
+++ b/ui/base/clipboard/clipboard_unittest.cc
@@ -50,7 +50,7 @@ class ClipboardTest : public PlatformTest {
ClipboardTest() {}
#endif
- virtual ~ClipboardTest() {
+ ~ClipboardTest() override {
ui::Clipboard::DestroyClipboardForCurrentThread();
}
diff --git a/ui/base/cursor/cursor_loader_x11.h b/ui/base/cursor/cursor_loader_x11.h
index 2667221..8c947d1 100644
--- a/ui/base/cursor/cursor_loader_x11.h
+++ b/ui/base/cursor/cursor_loader_x11.h
@@ -20,18 +20,16 @@ namespace ui {
class UI_BASE_EXPORT CursorLoaderX11 : public CursorLoader {
public:
CursorLoaderX11();
- virtual ~CursorLoaderX11();
+ ~CursorLoaderX11() override;
// Overridden from CursorLoader:
- virtual void LoadImageCursor(int id,
- int resource_id,
- const gfx::Point& hot) override;
- virtual void LoadAnimatedCursor(int id,
- int resource_id,
- const gfx::Point& hot,
- int frame_delay_ms) override;
- virtual void UnloadAll() override;
- virtual void SetPlatformCursor(gfx::NativeCursor* cursor) override;
+ void LoadImageCursor(int id, int resource_id, const gfx::Point& hot) override;
+ void LoadAnimatedCursor(int id,
+ int resource_id,
+ const gfx::Point& hot,
+ int frame_delay_ms) override;
+ void UnloadAll() override;
+ void SetPlatformCursor(gfx::NativeCursor* cursor) override;
const XcursorImage* GetXcursorImageForTest(int id);
diff --git a/ui/base/dragdrop/drag_utils.cc b/ui/base/dragdrop/drag_utils.cc
index 363dad4..e8723c8 100644
--- a/ui/base/dragdrop/drag_utils.cc
+++ b/ui/base/dragdrop/drag_utils.cc
@@ -36,11 +36,10 @@ class FileDragImageSource : public gfx::CanvasImageSource {
icon_(icon) {
}
- virtual ~FileDragImageSource() {
- }
+ ~FileDragImageSource() override {}
// Overridden from gfx::CanvasImageSource.
- virtual void Draw(gfx::Canvas* canvas) override {
+ void Draw(gfx::Canvas* canvas) override {
if (!icon_.isNull()) {
// Paint the icon.
canvas->DrawImageInt(icon_, (size().width() - icon_.width()) / 2, 0);
diff --git a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
index 9664b02..08c93e0 100644
--- a/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
+++ b/ui/base/dragdrop/os_exchange_data_provider_aurax11.h
@@ -43,7 +43,7 @@ class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
// hidden X11 window to own send data.
OSExchangeDataProviderAuraX11();
- virtual ~OSExchangeDataProviderAuraX11();
+ ~OSExchangeDataProviderAuraX11() override;
// After all the Set* methods have built up the data we're offering, call
// this to take ownership of the XdndSelection clipboard.
@@ -61,45 +61,43 @@ class UI_BASE_EXPORT OSExchangeDataProviderAuraX11
}
// Overridden from OSExchangeData::Provider:
- virtual Provider* Clone() const override;
- virtual void MarkOriginatedFromRenderer() override;
- virtual bool DidOriginateFromRenderer() const override;
- virtual void SetString(const base::string16& data) override;
- virtual void SetURL(const GURL& url, const base::string16& title) override;
- virtual void SetFilename(const base::FilePath& path) override;
- virtual void SetFilenames(const std::vector<FileInfo>& filenames) override;
- virtual void SetPickledData(const OSExchangeData::CustomFormat& format,
- const Pickle& pickle) override;
- virtual bool GetString(base::string16* data) const override;
- virtual bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy,
- GURL* url,
- base::string16* title) const override;
- virtual bool GetFilename(base::FilePath* path) const override;
- virtual bool GetFilenames(std::vector<FileInfo>* filenames) const override;
- virtual bool GetPickledData(const OSExchangeData::CustomFormat& format,
- Pickle* pickle) const override;
- virtual bool HasString() const override;
- virtual bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const
- override;
- virtual bool HasFile() const override;
- virtual bool HasCustomFormat(const OSExchangeData::CustomFormat& format) const
- override;
-
- virtual void SetFileContents(const base::FilePath& filename,
- const std::string& file_contents) override;
-
- virtual void SetHtml(const base::string16& html,
- const GURL& base_url) override;
- virtual bool GetHtml(base::string16* html, GURL* base_url) const override;
- virtual bool HasHtml() const override;
- virtual void SetDragImage(const gfx::ImageSkia& image,
- const gfx::Vector2d& cursor_offset) override;
- virtual const gfx::ImageSkia& GetDragImage() const override;
- virtual const gfx::Vector2d& GetDragImageOffset() const override;
+ Provider* Clone() const override;
+ void MarkOriginatedFromRenderer() override;
+ bool DidOriginateFromRenderer() const override;
+ void SetString(const base::string16& data) override;
+ void SetURL(const GURL& url, const base::string16& title) override;
+ void SetFilename(const base::FilePath& path) override;
+ void SetFilenames(const std::vector<FileInfo>& filenames) override;
+ void SetPickledData(const OSExchangeData::CustomFormat& format,
+ const Pickle& pickle) override;
+ bool GetString(base::string16* data) const override;
+ bool GetURLAndTitle(OSExchangeData::FilenameToURLPolicy policy,
+ GURL* url,
+ base::string16* title) const override;
+ bool GetFilename(base::FilePath* path) const override;
+ bool GetFilenames(std::vector<FileInfo>* filenames) const override;
+ bool GetPickledData(const OSExchangeData::CustomFormat& format,
+ Pickle* pickle) const override;
+ bool HasString() const override;
+ bool HasURL(OSExchangeData::FilenameToURLPolicy policy) const override;
+ bool HasFile() const override;
+ bool HasCustomFormat(
+ const OSExchangeData::CustomFormat& format) const override;
+
+ void SetFileContents(const base::FilePath& filename,
+ const std::string& file_contents) override;
+
+ void SetHtml(const base::string16& html, const GURL& base_url) override;
+ bool GetHtml(base::string16* html, GURL* base_url) const override;
+ bool HasHtml() const override;
+ void SetDragImage(const gfx::ImageSkia& image,
+ const gfx::Vector2d& cursor_offset) override;
+ const gfx::ImageSkia& GetDragImage() const override;
+ const gfx::Vector2d& GetDragImageOffset() const override;
// ui::PlatformEventDispatcher:
- virtual bool CanDispatchEvent(const PlatformEvent& event) override;
- virtual uint32_t DispatchEvent(const PlatformEvent& event) override;
+ bool CanDispatchEvent(const PlatformEvent& event) override;
+ uint32_t DispatchEvent(const PlatformEvent& event) override;
private:
friend class OSExchangeDataProviderAuraX11Test;
diff --git a/ui/base/ime/input_method_auralinux.h b/ui/base/ime/input_method_auralinux.h
index 505abbd..be8851a 100644
--- a/ui/base/ime/input_method_auralinux.h
+++ b/ui/base/ime/input_method_auralinux.h
@@ -19,32 +19,31 @@ class UI_BASE_EXPORT InputMethodAuraLinux
public LinuxInputMethodContextDelegate {
public:
explicit InputMethodAuraLinux(internal::InputMethodDelegate* delegate);
- virtual ~InputMethodAuraLinux();
+ ~InputMethodAuraLinux() override;
// Overriden from InputMethod.
- virtual void Init(bool focused) override;
- virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
- NativeEventResult* result) override;
- virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override;
- virtual void OnTextInputTypeChanged(const TextInputClient* client) override;
- virtual void OnCaretBoundsChanged(const TextInputClient* client) override;
- virtual void CancelComposition(const TextInputClient* client) override;
- virtual void OnInputLocaleChanged() override;
- virtual std::string GetInputLocale() override;
- virtual bool IsActive() override;
- virtual bool IsCandidatePopupOpen() const override;
+ void Init(bool focused) override;
+ bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
+ NativeEventResult* result) override;
+ bool DispatchKeyEvent(const ui::KeyEvent& event) override;
+ void OnTextInputTypeChanged(const TextInputClient* client) override;
+ void OnCaretBoundsChanged(const TextInputClient* client) override;
+ void CancelComposition(const TextInputClient* client) override;
+ void OnInputLocaleChanged() override;
+ std::string GetInputLocale() override;
+ bool IsActive() override;
+ bool IsCandidatePopupOpen() const override;
// Overriden from ui::LinuxInputMethodContextDelegate
- virtual void OnCommit(const base::string16& text) override;
- virtual void OnPreeditChanged(const CompositionText& composition_text)
- override;
- virtual void OnPreeditEnd() override;
- virtual void OnPreeditStart() override;
+ void OnCommit(const base::string16& text) override;
+ void OnPreeditChanged(const CompositionText& composition_text) override;
+ void OnPreeditEnd() override;
+ void OnPreeditStart() override;
protected:
// Overridden from InputMethodBase.
- virtual void OnDidChangeFocusedClient(TextInputClient* focused_before,
- TextInputClient* focused) override;
+ void OnDidChangeFocusedClient(TextInputClient* focused_before,
+ TextInputClient* focused) override;
private:
// Allows to fire a VKEY_PROCESSKEY key event.
diff --git a/ui/base/ime/input_method_base_unittest.cc b/ui/base/ime/input_method_base_unittest.cc
index 48d0c09..129d3c5 100644
--- a/ui/base/ime/input_method_base_unittest.cc
+++ b/ui/base/ime/input_method_base_unittest.cc
@@ -126,16 +126,11 @@ class InputMethodBaseTest : public testing::Test {
protected:
InputMethodBaseTest() {
}
- virtual ~InputMethodBaseTest() {
- }
+ ~InputMethodBaseTest() override {}
- virtual void SetUp() {
- message_loop_.reset(new base::MessageLoopForUI);
- }
+ void SetUp() override { message_loop_.reset(new base::MessageLoopForUI); }
- virtual void TearDown() {
- message_loop_.reset();
- }
+ void TearDown() override { message_loop_.reset(); }
private:
scoped_ptr<base::MessageLoop> message_loop_;
diff --git a/ui/base/ime/input_method_minimal.h b/ui/base/ime/input_method_minimal.h
index 14700f5..b797eb8 100644
--- a/ui/base/ime/input_method_minimal.h
+++ b/ui/base/ime/input_method_minimal.h
@@ -14,18 +14,18 @@ namespace ui {
class UI_BASE_EXPORT InputMethodMinimal : public InputMethodBase {
public:
explicit InputMethodMinimal(internal::InputMethodDelegate* delegate);
- virtual ~InputMethodMinimal();
+ ~InputMethodMinimal() override;
// Overriden from InputMethod.
- virtual bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
- NativeEventResult* result) override;
- virtual bool DispatchKeyEvent(const ui::KeyEvent& event) override;
- virtual void OnCaretBoundsChanged(const TextInputClient* client) override;
- virtual void CancelComposition(const TextInputClient* client) override;
- virtual void OnInputLocaleChanged() override;
- virtual std::string GetInputLocale() override;
- virtual bool IsActive() override;
- virtual bool IsCandidatePopupOpen() const override;
+ bool OnUntranslatedIMEMessage(const base::NativeEvent& event,
+ NativeEventResult* result) override;
+ bool DispatchKeyEvent(const ui::KeyEvent& event) override;
+ void OnCaretBoundsChanged(const TextInputClient* client) override;
+ void CancelComposition(const TextInputClient* client) override;
+ void OnInputLocaleChanged() override;
+ std::string GetInputLocale() override;
+ bool IsActive() override;
+ bool IsCandidatePopupOpen() const override;
private:
DISALLOW_COPY_AND_ASSIGN(InputMethodMinimal);
diff --git a/ui/base/ime/linux/fake_input_method_context.h b/ui/base/ime/linux/fake_input_method_context.h
index d13d2b9..769847e 100644
--- a/ui/base/ime/linux/fake_input_method_context.h
+++ b/ui/base/ime/linux/fake_input_method_context.h
@@ -15,11 +15,10 @@ class FakeInputMethodContext : public LinuxInputMethodContext {
FakeInputMethodContext();
// Overriden from ui::LinuxInputMethodContext
- virtual bool DispatchKeyEvent(const ui::KeyEvent& key_event) override;
- virtual void Reset() override;
- virtual void OnTextInputTypeChanged(ui::TextInputType text_input_type)
- override;
- virtual void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override;
+ bool DispatchKeyEvent(const ui::KeyEvent& key_event) override;
+ void Reset() override;
+ void OnTextInputTypeChanged(ui::TextInputType text_input_type) override;
+ void OnCaretBoundsChanged(const gfx::Rect& caret_bounds) override;
private:
DISALLOW_COPY_AND_ASSIGN(FakeInputMethodContext);
diff --git a/ui/base/ime/linux/fake_input_method_context_factory.h b/ui/base/ime/linux/fake_input_method_context_factory.h
index d6101fa..f3d7989 100644
--- a/ui/base/ime/linux/fake_input_method_context_factory.h
+++ b/ui/base/ime/linux/fake_input_method_context_factory.h
@@ -16,7 +16,7 @@ class FakeInputMethodContextFactory : public LinuxInputMethodContextFactory {
FakeInputMethodContextFactory();
// Overriden from ui::LinuxInputMethodContextFactory
- virtual scoped_ptr<LinuxInputMethodContext> CreateInputMethodContext(
+ scoped_ptr<LinuxInputMethodContext> CreateInputMethodContext(
LinuxInputMethodContextDelegate* delegate) const override;
private:
diff --git a/ui/base/models/tree_node_model_unittest.cc b/ui/base/models/tree_node_model_unittest.cc
index ba923aa..f83569f 100644
--- a/ui/base/models/tree_node_model_unittest.cc
+++ b/ui/base/models/tree_node_model_unittest.cc
@@ -22,7 +22,7 @@ class TreeNodeModelTest : public testing::Test, public TreeModelObserver {
: added_count_(0),
removed_count_(0),
changed_count_(0) {}
- virtual ~TreeNodeModelTest() {}
+ ~TreeNodeModelTest() override {}
protected:
std::string GetObserverCountStateAndClear() {
diff --git a/ui/base/resource/resource_bundle_unittest.cc b/ui/base/resource/resource_bundle_unittest.cc
index 565bf59..80a92f3 100644
--- a/ui/base/resource/resource_bundle_unittest.cc
+++ b/ui/base/resource/resource_bundle_unittest.cc
@@ -149,13 +149,10 @@ class ResourceBundleTest : public testing::Test {
ResourceBundleTest() : resource_bundle_(NULL) {
}
- virtual ~ResourceBundleTest() {
- }
+ ~ResourceBundleTest() override {}
// Overridden from testing::Test:
- virtual void TearDown() override {
- delete resource_bundle_;
- }
+ void TearDown() override { delete resource_bundle_; }
// Returns new ResoureBundle with the specified |delegate|. The
// ResourceBundleTest class manages the lifetime of the returned
@@ -380,10 +377,9 @@ class ResourceBundleImageTest : public ResourceBundleTest {
public:
ResourceBundleImageTest() {}
- virtual ~ResourceBundleImageTest() {
- }
+ ~ResourceBundleImageTest() override {}
- virtual void SetUp() override {
+ void SetUp() override {
// Create a temporary directory to write test resource bundles to.
ASSERT_TRUE(dir_.CreateUniqueTempDir());
}
diff --git a/ui/base/x/selection_requestor_unittest.cc b/ui/base/x/selection_requestor_unittest.cc
index f2c7b03..4095d44 100644
--- a/ui/base/x/selection_requestor_unittest.cc
+++ b/ui/base/x/selection_requestor_unittest.cc
@@ -36,8 +36,7 @@ class SelectionRequestorTest : public testing::Test {
atom_cache_.allow_uncached_atoms();
}
- virtual ~SelectionRequestorTest() {
- }
+ ~SelectionRequestorTest() override {}
// Responds to the SelectionRequestor's XConvertSelection() request by
// - Setting the property passed into the XConvertSelection() request to
@@ -65,7 +64,7 @@ class SelectionRequestorTest : public testing::Test {
}
protected:
- virtual void SetUp() override {
+ void SetUp() override {
// Make X11 synchronous for our display connection.
XSynchronize(x_display_, True);
@@ -85,7 +84,7 @@ class SelectionRequestorTest : public testing::Test {
requestor_.reset(new SelectionRequestor(x_display_, x_window_, NULL));
}
- virtual void TearDown() override {
+ void TearDown() override {
requestor_.reset();
event_source_.reset();
XDestroyWindow(x_display_, x_window_);
diff --git a/ui/base/x/x11_util.h b/ui/base/x/x11_util.h
index cb468a8..ffcf846 100644
--- a/ui/base/x/x11_util.h
+++ b/ui/base/x/x11_util.h
@@ -305,11 +305,11 @@ class UI_BASE_EXPORT XRefcountedMemory : public base::RefCountedMemory {
: x11_data_(length ? x11_data : NULL), length_(length) {}
// Overridden from RefCountedMemory:
- virtual const unsigned char* front() const override;
- virtual size_t size() const override;
+ const unsigned char* front() const override;
+ size_t size() const override;
private:
- virtual ~XRefcountedMemory();
+ ~XRefcountedMemory() override;
unsigned char* x11_data_;
size_t length_;
generated by cgit v1.1 at 2025-05-13 09:24:24 +0000