Update To 11.40.268.0

[platform/framework/web/crosswalk.git] / src / chrome / browser / chromeos / options / network_config_view.h

diff --git a/src/chrome/browser/chromeos/options/network_config_view.h b/src/chrome/browser/chromeos/options/network_config_view.h
index 702a2fa..58b45bf 100644 (file)
--- a/src/chrome/browser/chromeos/options/network_config_view.h
+++ b/src/chrome/browser/chromeos/options/network_config_view.h
@@ -54,23 +54,24 @@ class NetworkConfigView : public views::DialogDelegateView,
   gfx::NativeWindow GetNativeWindow() const;
 
   // views::DialogDelegate methods.
-  virtual string16 GetDialogButtonLabel(ui::DialogButton button) const OVERRIDE;
-  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const OVERRIDE;
-  virtual bool Cancel() OVERRIDE;
-  virtual bool Accept() OVERRIDE;
-  virtual views::View* CreateExtraView() OVERRIDE;
-  virtual views::View* GetInitiallyFocusedView() OVERRIDE;
+  virtual base::string16 GetDialogButtonLabel(
+      ui::DialogButton button) const override;
+  virtual bool IsDialogButtonEnabled(ui::DialogButton button) const override;
+  virtual bool Cancel() override;
+  virtual bool Accept() override;
+  virtual views::View* CreateExtraView() override;
+  virtual views::View* GetInitiallyFocusedView() override;
 
   // views::WidgetDelegate methods.
-  virtual string16 GetWindowTitle() const OVERRIDE;
-  virtual ui::ModalType GetModalType() const OVERRIDE;
+  virtual base::string16 GetWindowTitle() const override;
+  virtual ui::ModalType GetModalType() const override;
 
   // views::View overrides.
-  virtual void GetAccessibleState(ui::AccessibleViewState* state) OVERRIDE;
+  virtual void GetAccessibleState(ui::AXViewState* state) override;
 
   // views::ButtonListener overrides.
   virtual void ButtonPressed(
-      views::Button* sender, const ui::Event& event) OVERRIDE;
+      views::Button* sender, const ui::Event& event) override;
 
   void set_delegate(Delegate* delegate) {
     delegate_ = delegate;
@@ -78,10 +79,10 @@ class NetworkConfigView : public views::DialogDelegateView,
 
  protected:
   // views::View overrides:
-  virtual void Layout() OVERRIDE;
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
+  virtual void Layout() override;
+  virtual gfx::Size GetPreferredSize() const override;
   virtual void ViewHierarchyChanged(
-      const ViewHierarchyChangedDetails& details) OVERRIDE;
+      const ViewHierarchyChangedDetails& details) override;
 
  private:
   NetworkConfigView();
@@ -121,7 +122,7 @@ class ChildNetworkConfigView : public views::View {
   virtual ~ChildNetworkConfigView();
 
   // Get the title to show for the dialog.
-  virtual string16 GetTitle() const = 0;
+  virtual base::string16 GetTitle() const = 0;
 
   // Returns view that should be focused on dialog activation.
   virtual views::View* GetInitiallyFocusedView() = 0;
@@ -140,10 +141,16 @@ class ChildNetworkConfigView : public views::View {
   // being active. For example, clicking on "Advanced" button.
   virtual void InitFocus() = 0;
 
+  // Returns 'true' if the dialog is for configuration only (default is false).
+  virtual bool IsConfigureDialog();
+
   // Minimum with of input fields / combo boxes.
   static const int kInputFieldMinWidth;
 
  protected:
+  // Gets the default network share state for the current login state.
+  static void GetShareStateForLoginState(bool* default_value, bool* modifiable);
+
   NetworkConfigView* parent_;
   std::string service_path_;
 
@@ -164,10 +171,8 @@ class ControlledSettingIndicatorView : public views::View {
 
  protected:
   // views::View:
-  virtual gfx::Size GetPreferredSize() OVERRIDE;
-  virtual void Layout() OVERRIDE;
-  virtual void OnMouseEntered(const ui::MouseEvent& event) OVERRIDE;
-  virtual void OnMouseExited(const ui::MouseEvent& event) OVERRIDE;
+  virtual gfx::Size GetPreferredSize() const override;
+  virtual void Layout() override;
 
  private:
   // Initializes the view.
@@ -175,8 +180,7 @@ class ControlledSettingIndicatorView : public views::View {
 
   bool managed_;
   views::ImageView* image_view_;
-  const gfx::ImageSkia* gray_image_;
-  const gfx::ImageSkia* color_image_;
+  const gfx::ImageSkia* image_;
 
   DISALLOW_COPY_AND_ASSIGN(ControlledSettingIndicatorView);
 };