diff options
| author | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 20:28:09 +0000 |
|---|---|---|
| committer | dhollowa@chromium.org <dhollowa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-01-20 20:28:09 +0000 |
| commit | 900324023da46b31893839c54d43c1f74138e616 (patch) | |
| tree | 3ea382519e8f6c9d932119bb058166396a138056 /ash | |
| parent | b3ef40d5f95c531ff8fc36d5d3a7b9290c7b6ce9 (diff) | |
| download | chromium_src-900324023da46b31893839c54d43c1f74138e616.zip chromium_src-900324023da46b31893839c54d43c1f74138e616.tar.gz chromium_src-900324023da46b31893839c54d43c1f74138e616.tar.bz2 | |
UnConfineCursor addition breaks Mac/Aura
Provide stub implementation for Mac/Aura for this new RootWindowHost
method. Also fixes up other compile and clang/style problem.
MainAppBundle call got renamed to FrameworkBundle.
BUG=None
TEST=None
R=sky@chromium.org
Review URL: https://chromiumcodereview.appspot.com/9270011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@118484 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ash')
| -rw-r--r-- | ash/shell/shell_main_parts_mac.mm | 4 | ||||
| -rw-r--r-- | ash/wm/window_cycle_list.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/ash/shell/shell_main_parts_mac.mm b/ash/shell/shell_main_parts_mac.mm index 238ffe5..fc4e651 100644 --- a/ash/shell/shell_main_parts_mac.mm +++ b/ash/shell/shell_main_parts_mac.mm @@ -7,7 +7,7 @@ #import <Cocoa/Cocoa.h> #include "base/i18n/icu_util.h" -#include "base/mac/mac_util.h" +#include "base/mac/bundle_locations.h" #include "base/memory/scoped_nsobject.h" #include "ui/base/resource/resource_bundle.h" #include "ui/base/ui_base_paths.h" @@ -22,7 +22,7 @@ void PreMainMessageLoopStart() { scoped_nsobject<NSNib> nib([[NSNib alloc] initWithNibNamed:@"MainMenu" - bundle:base::mac::MainAppBundle()]); + bundle:base::mac::FrameworkBundle()]); [nib instantiateNibWithOwner:NSApp topLevelObjects:nil]; } diff --git a/ash/wm/window_cycle_list.h b/ash/wm/window_cycle_list.h index 0873eea..aad0658 100644 --- a/ash/wm/window_cycle_list.h +++ b/ash/wm/window_cycle_list.h @@ -29,7 +29,7 @@ class ASH_EXPORT WindowCycleList : public aura::WindowObserver { explicit WindowCycleList(const WindowList& windows); virtual ~WindowCycleList(); - const bool empty() const { return windows_.empty(); } + bool empty() const { return windows_.empty(); } // Cycles to the next or previous window based on |direction|. void Step(Direction direction); |