chrome/browser/gtk/browser_window_gtk.cc - Issue 63142: Scaffolding cleanup.

Side by Side Diff: chrome/browser/gtk/browser_window_gtk.cc

Issue 63142: Scaffolding cleanup. (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/

Patch Set: '' Created 11 years, 8 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 unified diff | Download patch | Annotate | Revision Log

« no previous file with comments | « chrome/browser/cocoa/bookmark_bar_state_controller.mm ('k') | chrome/browser/renderer_host/browser_render_process_host.cc » ('j') | chrome/common/temp_scaffolding_stubs.cc » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
1 // Copyright (c) 2009 The Chromium Authors. All rights reserved.	1 // Copyright (c) 2009 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 #include "chrome/browser/gtk/browser_window_gtk.h"	5 #include "chrome/browser/gtk/browser_window_gtk.h"

6	6

7 #include <gdk/gdkkeysyms.h>	7 #include <gdk/gdkkeysyms.h>

8	8

9 #include "base/base_paths_linux.h"	9 #include "base/base_paths_linux.h"

10 #include "base/command_line.h"	10 #include "base/command_line.h"

(...skipping 14 matching lines...) Expand all Loading...
25 #include "chrome/browser/gtk/status_bubble_gtk.h"	25 #include "chrome/browser/gtk/status_bubble_gtk.h"

26 #include "chrome/browser/gtk/tab_contents_container_gtk.h"	26 #include "chrome/browser/gtk/tab_contents_container_gtk.h"

27 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"	27 #include "chrome/browser/gtk/tabs/tab_strip_gtk.h"

28 #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h"	28 #include "chrome/browser/gtk/toolbar_star_toggle_gtk.h"

29 #include "chrome/browser/location_bar.h"	29 #include "chrome/browser/location_bar.h"

30 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"	30 #include "chrome/browser/renderer_host/render_widget_host_view_gtk.h"

31 #include "chrome/browser/tab_contents/web_contents.h"	31 #include "chrome/browser/tab_contents/web_contents.h"

32 #include "chrome/browser/tab_contents/web_contents_view.h"	32 #include "chrome/browser/tab_contents/web_contents_view.h"

33 #include "chrome/common/chrome_switches.h"	33 #include "chrome/common/chrome_switches.h"

34 #include "chrome/common/notification_service.h"	34 #include "chrome/common/notification_service.h"

	35 #include "chrome/common/pref_names.h"

	36 #include "chrome/common/pref_service.h"

35 #include "chrome/common/resource_bundle.h"	37 #include "chrome/common/resource_bundle.h"

36 #include "chrome/views/controls/button/text_button.h"	38 #include "chrome/views/controls/button/text_button.h"

37 #include "grit/theme_resources.h"	39 #include "grit/theme_resources.h"

38	40

39 namespace {	41 namespace {

40	42

41 // The number of milliseconds between loading animation frames.	43 // The number of milliseconds between loading animation frames.

42 const int kLoadingAnimationFrameTimeMs = 30;	44 const int kLoadingAnimationFrameTimeMs = 30;

43	45

44 const GdkColor kBorderColor = GDK_COLOR_RGB(0xbe, 0xc8, 0xd4);	46 const GdkColor kBorderColor = GDK_COLOR_RGB(0xbe, 0xc8, 0xd4);

(...skipping 610 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
655 } else {	657 } else {

656 browser_window->ExecuteBrowserCommand(command_id);	658 browser_window->ExecuteBrowserCommand(command_id);

657 }	659 }

658	660

659 return TRUE;	661 return TRUE;

660 }	662 }

661	663

662 void BrowserWindowGtk::ExecuteBrowserCommand(int id) {	664 void BrowserWindowGtk::ExecuteBrowserCommand(int id) {

663 browser_->ExecuteCommand(id);	665 browser_->ExecuteCommand(id);

664 }	666 }

OLD	NEW