| OLD | NEW |
|---|
| 1 // Copyright 2012 The Chromium Authors. All rights reserved. | 1 // Copyright 2012 The Chromium Authors. All rights reserved. |
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be |
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. |
| 4 | 4 |
| 5 #ifndef COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_ | 5 #ifndef COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_ |
| 6 #define COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_ | 6 #define COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_ |
| 7 | 7 |
| 8 #include <stddef.h> |
| 9 |
| 8 #include <string> | 10 #include <string> |
| 9 | 11 |
| 10 #include "base/basictypes.h" | 12 #include "base/macros.h" |
| 11 #include "base/strings/string16.h" | 13 #include "base/strings/string16.h" |
| 12 #include "url/gurl.h" | 14 #include "url/gurl.h" |
| 13 | 15 |
| 14 namespace gfx { | 16 namespace gfx { |
| 15 enum class VectorIconId; | 17 enum class VectorIconId; |
| 16 } | 18 } |
| 17 | 19 |
| 18 namespace net { | 20 namespace net { |
| 19 class X509Certificate; | 21 class X509Certificate; |
| 20 } | 22 } |
| (...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 97 ToolbarModel(); | 99 ToolbarModel(); |
| 98 | 100 |
| 99 private: | 101 private: |
| 100 bool input_in_progress_; | 102 bool input_in_progress_; |
| 101 bool url_replacement_enabled_; | 103 bool url_replacement_enabled_; |
| 102 | 104 |
| 103 DISALLOW_COPY_AND_ASSIGN(ToolbarModel); | 105 DISALLOW_COPY_AND_ASSIGN(ToolbarModel); |
| 104 }; | 106 }; |
| 105 | 107 |
| 106 #endif // COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_ | 108 #endif // COMPONENTS_TOOLBAR_TOOLBAR_MODEL_H_ |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 1549993003:
Switch to standard integer types in components/, part 4 of 4. (Closed)
Base URL: https://chromium.googlesource.com/chromium/src.git@master