Views: Replace resource ids with ui::TextEditCommand enum for text editing commands in Textfield.

ui/views/controls/textfield/textfield.h

 // 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 UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 #define UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_
 
 #include <stddef.h>
 #include <stdint.h>
 
@@ skipping 185 matching lines @@
   // Empty and invalid ranges are ignored.
   void SetStyle(gfx::TextStyle style, bool value);
   void ApplyStyle(gfx::TextStyle style, bool value, const gfx::Range& range);
 
   // Clears Edit history.
   void ClearEditHistory();
 
   // Set the accessible name of the text field.
   void SetAccessibleName(const base::string16& name);
 
-  // Performs the action associated with the specified command id.
-  void ExecuteCommand(int command_id);
-
   // Returns whether there is a drag operation originating from the textfield.
   bool HasTextBeingDragged();
 
   // View overrides:
   gfx::Insets GetInsets() const override;
   int GetBaseline() const override;
   gfx::Size GetPreferredSize() const override;
   const char* GetClassName() const override;
   gfx::NativeCursor GetCursor(const ui::MouseEvent& event) override;
   bool OnMousePressed(const ui::MouseEvent& event) override;
@@ skipping 80 matching lines @@
   bool GetSelectionRange(gfx::Range* range) const override;
   bool SetSelectionRange(const gfx::Range& range) override;
   bool DeleteRange(const gfx::Range& range) override;
   bool GetTextFromRange(const gfx::Range& range,
                         base::string16* text) const override;
   void OnInputMethodChanged() override;
   bool ChangeTextDirectionAndLayoutAlignment(
       base::i18n::TextDirection direction) override;
   void ExtendSelectionAndDelete(size_t before, size_t after) override;
   void EnsureCaretInRect(const gfx::Rect& rect) override;
-  bool IsEditCommandEnabled(int command_id) override;
-  void SetEditCommandForNextKeyEvent(int command_id) override;
+  bool IsEditCommandEnabled(ui::TextEditCommand command) const override;
+  void SetEditCommandForNextKeyEvent(ui::TextEditCommand command) override;
 
  protected:
   // Inserts or appends a character in response to an IME operation.
   virtual void DoInsertChar(base::char16 ch);
 
   // Returns the TextfieldModel's text/cursor/selection rendering model.
   gfx::RenderText* GetRenderText() const;
 
   gfx::Point last_click_location() const { return last_click_location_; }
 
   // Get the text from the selection clipboard.
   virtual base::string16 GetSelectionClipboardText() const;
 
+  ui::TextEditCommand scheduled_edit_command() const {
+    return scheduled_edit_command_;
+  }
+
+  void reset_scheduled_edit_command() {
+    scheduled_edit_command_ = ui::TextEditCommand::INVALID_COMMAND;
+  }
+
+  // Performs the given |command|.
+  virtual void ExecuteEditCommand(ui::TextEditCommand command);
+
  private:
   friend class TextfieldTestApi;
 
   // Handles a request to change the value of this text field from software
   // using an accessibility API (typically automation software, screen readers
   // don't normally use this). Sets the value and clears the selection.
   void AccessibilitySetValue(const base::string16& new_value);
 
   // Updates the painted background color.
   void UpdateBackgroundColor();
@@ skipping 54 matching lines @@
 
   // Pastes the selection clipboard for the specified mouse event.
   void PasteSelectionClipboard(const ui::MouseEvent& event);
 
   // The text model.
   std::unique_ptr<TextfieldModel> model_;
 
   // This is the current listener for events from this Textfield.
   TextfieldController* controller_;
 
-  // If non-zero, an edit command to execute on the next key event. When set,
-  // the key event is still passed to |controller_|, but otherwise ignored in
-  // favor of the edit command. Set via SetEditCommandForNextKeyEvent() during
-  // dispatch of that key event (see comment in TextInputClient).
-  int scheduled_edit_command_;
+  // An edit command to execute on the next key event. When set to a valid
+  // command, the key event is still passed to |controller_|, but otherwise
+  // ignored in favor of the edit command. Set via
+  // SetEditCommandForNextKeyEvent() during dispatch of that key event (see
+  // comment in TextInputClient).
+  ui::TextEditCommand scheduled_edit_command_;
 
   // True if this Textfield cannot accept input and is read-only.
   bool read_only_;
 
   // The default number of average characters for the width of this text field.
   // This will be reported as the "desired size". Defaults to 0.
   int default_width_in_chars_;
 
   // Flags indicating whether various system colors should be used, and if not,
   // what overriding color values should be used instead.
@@ skipping 71 matching lines @@
 
   // Used to bind callback functions to this object.
   base::WeakPtrFactory<Textfield> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(Textfield);
 };
 
 }  // namespace views
 
 #endif  // UI_VIEWS_CONTROLS_TEXTFIELD_TEXTFIELD_H_