| OLD | NEW |
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 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 CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 5 #ifndef CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 6 #define CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| 7 | 7 |
| 8 #include <stddef.h> | 8 #include <stddef.h> |
| 9 | 9 |
| 10 #include <string> | 10 #include <string> |
| (...skipping 232 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 243 | 243 |
| 244 // views::View: | 244 // views::View: |
| 245 bool HasFocus() const override; | 245 bool HasFocus() const override; |
| 246 void GetAccessibleState(ui::AXViewState* state) override; | 246 void GetAccessibleState(ui::AXViewState* state) override; |
| 247 gfx::Size GetPreferredSize() const override; | 247 gfx::Size GetPreferredSize() const override; |
| 248 void Layout() override; | 248 void Layout() override; |
| 249 void OnNativeThemeChanged(const ui::NativeTheme* theme) override; | 249 void OnNativeThemeChanged(const ui::NativeTheme* theme) override; |
| 250 | 250 |
| 251 // ChromeOmniboxEditController: | 251 // ChromeOmniboxEditController: |
| 252 void UpdateWithoutTabRestore() override; | 252 void UpdateWithoutTabRestore() override; |
| 253 void ShowURL() override; | |
| 254 ToolbarModel* GetToolbarModel() override; | 253 ToolbarModel* GetToolbarModel() override; |
| 255 content::WebContents* GetWebContents() override; | 254 content::WebContents* GetWebContents() override; |
| 256 | 255 |
| 257 // ZoomEventManagerObserver: | 256 // ZoomEventManagerObserver: |
| 258 // Updates the view for the zoom icon when default zoom levels change. | 257 // Updates the view for the zoom icon when default zoom levels change. |
| 259 void OnDefaultZoomLevelChanged() override; | 258 void OnDefaultZoomLevelChanged() override; |
| 260 | 259 |
| 261 private: | 260 private: |
| 262 typedef std::vector<ContentSettingImageView*> ContentSettingViews; | 261 typedef std::vector<ContentSettingImageView*> ContentSettingViews; |
| 263 | 262 |
| (...skipping 215 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 479 BooleanPrefMember edit_bookmarks_enabled_; | 478 BooleanPrefMember edit_bookmarks_enabled_; |
| 480 | 479 |
| 481 // This is a debug state variable that stores if the WebContents was null | 480 // This is a debug state variable that stores if the WebContents was null |
| 482 // during the last RefreshPageAction. | 481 // during the last RefreshPageAction. |
| 483 bool web_contents_null_at_last_refresh_; | 482 bool web_contents_null_at_last_refresh_; |
| 484 | 483 |
| 485 DISALLOW_COPY_AND_ASSIGN(LocationBarView); | 484 DISALLOW_COPY_AND_ASSIGN(LocationBarView); |
| 486 }; | 485 }; |
| 487 | 486 |
| 488 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ | 487 #endif // CHROME_BROWSER_UI_VIEWS_LOCATION_BAR_LOCATION_BAR_VIEW_H_ |
| OLD | NEW |