Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(911)

Unified Diff: ash/system/chromeos/tray_display.h

Issue 2217713002: Remove the system menu display settings row (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: merge Created 4 years, 3 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: ash/system/chromeos/tray_display.h
diff --git a/ash/system/chromeos/tray_display.h b/ash/system/chromeos/tray_display.h
deleted file mode 100644
index cd1fcfed269b787757bdd5564f9baf4764bb99b3..0000000000000000000000000000000000000000
--- a/ash/system/chromeos/tray_display.h
+++ /dev/null
@@ -1,76 +0,0 @@
-// Copyright (c) 2012 The Chromium Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-#ifndef ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
-#define ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
-
-#include <stdint.h>
-
-#include <map>
-
-#include "ash/ash_export.h"
-#include "ash/common/system/tray/system_tray_item.h"
-#include "ash/common/wm_display_observer.h"
-#include "base/macros.h"
-#include "base/strings/string16.h"
-#include "ui/display/manager/managed_display_info.h"
-#include "ui/views/view.h"
-
-namespace ash {
-
-class DisplayView;
-
-class ASH_EXPORT TrayDisplay : public SystemTrayItem, public WmDisplayObserver {
- public:
- explicit TrayDisplay(SystemTray* system_tray);
- ~TrayDisplay() override;
-
- // Overridden from WmDisplayObserver:
- void OnDisplayConfigurationChanged() override;
-
- private:
- friend class TrayDisplayTest;
-
- using DisplayInfoMap = std::map<int64_t, display::ManagedDisplayInfo>;
-
- static const char kNotificationId[];
-
- // Scans the current display info and updates |display_info_|. Sets the
- // previous data to |old_info| if it's not NULL.
- void UpdateDisplayInfo(DisplayInfoMap* old_info);
-
- // Compares the current display settings with |old_info| and determine what
- // message should be shown for notification. Returns true if there's a
- // meaningful change. Note that it's possible to return true and set
- // |message_out| to empty, which means the notification should be removed. It
- // also sets |additional_message_out| which appears in the notification with
- // the |message_out|.
- bool GetDisplayMessageForNotification(const DisplayInfoMap& old_info,
- base::string16* message_out,
- base::string16* additional_message_out);
-
- // Creates or updates the display notification.
- void CreateOrUpdateNotification(const base::string16& message,
- const base::string16& additional_message);
-
- // Overridden from SystemTrayItem.
- views::View* CreateDefaultView(LoginStatus status) override;
- void DestroyDefaultView() override;
-
- // Test accessors.
- base::string16 GetDefaultViewMessage() const;
- bool GetAccessibleStateForTesting(ui::AXViewState* state);
- const views::View* default_view() const {
- return reinterpret_cast<views::View*>(default_);
- }
-
- DisplayView* default_;
- DisplayInfoMap display_info_;
-
- DISALLOW_COPY_AND_ASSIGN(TrayDisplay);
-};
-
-} // namespace ash
-
-#endif // ASH_SYSTEM_CHROMEOS_TRAY_DISPLAY_H_
« no previous file with comments | « ash/system/chromeos/screen_layout_observer_unittest.cc ('k') | ash/system/chromeos/tray_display_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698